added shard data path to coordinator config

pg-sharding · Jul 24, 2023 · b74f92c · b74f92c
1 parent 53f1b6d
commit b74f92c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 11 deletions.
diff --git a/docker/coordinator/cfg.yaml b/docker/coordinator/cfg.yaml
@@ -2,3 +2,4 @@ addr: '[spqr_coordinator]:7002'
 http_addr: 'spqr_coordinator:7003'
 qdb_addr: '[spqr_qdb_0_1]:2379'
 log_level: INFO
+shard_data: '/spqr/docker/coordinator/shard_data.yaml'
diff --git a/examples/coordinator.yaml b/examples/coordinator.yaml
@@ -2,4 +2,5 @@ addr: 'localhost:7002'
 http_addr: 'localhost:7003'
 qdb_addr: 'localhost:2379'
 log_level: INFO
+shard_data: '/spqr/docker/coordinator/shard_data.yaml'
 
diff --git a/pkg/config/coordinator.go b/pkg/config/coordinator.go
@@ -14,10 +14,11 @@ import (
 var cfgCoordinator Coordinator
 
 type Coordinator struct {
-	LogLevel string `json:"log_level" toml:"log_level" yaml:"log_level"`
-	QdbAddr  string `json:"qdb_addr" toml:"qdb_addr" yaml:"qdb_addr"`
-	HttpAddr string `json:"http_addr" toml:"http_addr" yaml:"http_addr"`
-	Addr     string `json:"addr" toml:"addr" yaml:"addr"`
+	LogLevel     string `json:"log_level" toml:"log_level" yaml:"log_level"`
+	QdbAddr      string `json:"qdb_addr" toml:"qdb_addr" yaml:"qdb_addr"`
+	HttpAddr     string `json:"http_addr" toml:"http_addr" yaml:"http_addr"`
+	Addr         string `json:"addr" toml:"addr" yaml:"addr"`
+	ShardDataCfg string `json:"shard_data" toml:"shard_data" yaml:"shard_data"`
 }
 
 func LoadCoordinatorCfg(cfgPath string) error {

diff --git a/pkg/datatransfers/data_transfers.go b/pkg/datatransfers/data_transfers.go
@@ -35,17 +35,16 @@ func (p *ProxyW) Write(bt []byte) (int, error) {
 var shards *config.DatatransferConnections
 var txFrom pgx.Tx
 var txTo pgx.Tx
-var remoteConfigDir = "/spqr/docker/coordinator/shard_data.yaml"
 var localConfigDir = "/pkg/datatransfers/shard_data.yaml"
 
 func createConnString(shardID string) string {
 	sd := shards.ShardsData[shardID]
 	return fmt.Sprintf("user=%s host=%s port=%s dbname=%s password=%s", sd.User, sd.Host, sd.Port, sd.DB, sd.Password)
 }
 
-func LoadConfig() error {
+func LoadConfig(path string) error {
 	var err error
-	shards, err = config.LoadShardDataCfg(remoteConfigDir)
+	shards, err = config.LoadShardDataCfg(path)
 	if err != nil {
 		p, _ := os.Getwd()
 		shards, err = config.LoadShardDataCfg(p + localConfigDir)
@@ -58,7 +57,7 @@ func LoadConfig() error {
 
 func MoveKeys(ctx context.Context, fromId, toId string, keyr qdb.KeyRange, shr []*shrule.ShardingRule) error {
 	if shards == nil {
-		err := LoadConfig()
+		err := LoadConfig(config.CoordinatorConfig().ShardDataCfg)
 		if err != nil {
 			return err
 		}

diff --git a/test/feature/conf/coordinator.yaml b/test/feature/conf/coordinator.yaml
@@ -2,3 +2,4 @@ addr: '[regress_coordinator]:7002'
 http_addr: 'regress_coordinator:7003'
 qdb_addr: '[regress_qdb_0_1]:2379'
 log_level: INFO
+shard_data: '/spqr/test/feature/conf/shard_data.yaml'
diff --git a/test/feature/conf/shard_data.yaml b/test/feature/conf/shard_data.yaml
@@ -0,0 +1,13 @@
+shards:
+  sh1:
+    db: regress
+    user: regress
+    Password: 12345678
+    host: 'spqr_shard_1'
+    port: '6432'
+  sh2:
+    db: regress
+    user: regress
+    Password: 12345678
+    host: 'spqr_shard_2'
+    port: '6432'
diff --git a/test/feature/spqr_test.go b/test/feature/spqr_test.go
@@ -181,12 +181,9 @@ func (tctx *testContext) cleanup() {
 
 // nolint: unparam
 func (tctx *testContext) connectPostgresql(addr string, timeout time.Duration) (*sqlx.DB, error) {
-	log.Default().Printf("connecting host: %s\n", addr)
 	if strings.Contains(addr, strconv.Itoa(coordinatorPort)) {
-		log.Default().Printf("connecting coordinator: %s\n", addr)
 		return tctx.connectCoordinatorWithCredentials(shardUser, shardPassword, addr, timeout)
 	}
-	log.Default().Printf("connecting no coordinator: %s\n", addr)
 	return tctx.connectPostgresqlWithCredentials(shardUser, shardPassword, addr, timeout)
 }