From e572c8f2c115a8c5fd4d4b98b0a7f5aef1d8623e Mon Sep 17 00:00:00 2001 From: Travis Turner Date: Mon, 12 Dec 2022 15:42:57 -0600 Subject: [PATCH] Fix dax docker-compose (dc-up) which was broken by ServiceManager (#2356) --- dax/docker-compose.yml | 9 ++++----- dax/server/server.go | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dax/docker-compose.yml b/dax/docker-compose.yml index 69e995297..f97cd4f56 100644 --- a/dax/docker-compose.yml +++ b/dax/docker-compose.yml @@ -8,9 +8,8 @@ services: environment: FEATUREBASE_BIND: 0.0.0.0:8080 FEATUREBASE_VERBOSE: "true" - FEATUREBASE_STORAGE_METHOD: boltdb - FEATUREBASE_STORAGE_DSN: file:/dax-data/mds.boldtb FEATUREBASE_MDS_RUN: "true" + FEATUREBASE_CONFIG_DATA_DIR: file:/dax-data/mds ports: - "8081:8080" @@ -22,7 +21,7 @@ services: FEATUREBASE_BIND: 0.0.0.0:8080 FEATUREBASE_VERBOSE: "true" FEATUREBASE_QUERYER_RUN: "true" - FEATUREBASE_QUERYER_CONFIG_MDS_ADDRESS: "mds:8080" + FEATUREBASE_QUERYER_CONFIG_MDS_ADDRESS: "mds:8080/mds" depends_on: - mds ports: @@ -34,7 +33,7 @@ services: dockerfile: ../Dockerfile-dax-quick environment: FEATUREBASE_COMPUTER_RUN: "true" - FEATUREBASE_COMPUTER_CONFIG_MDS_ADDRESS: "mds:8080" + FEATUREBASE_COMPUTER_CONFIG_MDS_ADDRESS: "mds:8080/mds" FEATUREBASE_COMPUTER_CONFIG_DATA_DIR: /dax-data/computer FEATUREBASE_BIND: 0.0.0.0:8080 FEATUREBASE_VERBOSE: "true" @@ -63,4 +62,4 @@ services: GEN_USE_SHARD_TRANSACTIONAL_ENDPOINT: "true" GEN_SOURCE: "custom" GEN_TARGET: "mds" - GEN_MDS_ADDRESS: "mds:8080" + GEN_MDS_ADDRESS: "mds:8080/mds" diff --git a/dax/server/server.go b/dax/server/server.go index 37bb692b8..5359ac7bf 100644 --- a/dax/server/server.go +++ b/dax/server/server.go @@ -309,7 +309,7 @@ func (m *Command) setupServices() error { var mdsAddr dax.Address if m.Config.Queryer.Config.MDSAddress != "" { - mdsAddr = dax.Address(m.Config.Queryer.Config.MDSAddress + "/" + dax.ServicePrefixMDS) + mdsAddr = dax.Address(m.Config.Queryer.Config.MDSAddress) } else if m.svcmgr.MDS != nil { mdsAddr = m.svcmgr.MDS.Address() } else {