fix metaserver client panic

eraft-io · Dec 14, 2024 · a2f530a · a2f530a
1 parent 76adb1a
commit a2f530a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/metaserver/client.go b/metaserver/client.go
@@ -77,7 +77,7 @@ func (metaSvrCli *MetaSvrCli) Query(ver int64) *Config {
 	}
 	resp := metaSvrCli.CallDoConfigRpc(confReq)
 	cf := &Config{}
-	if resp != nil {
+	if resp != nil && resp.Config != nil {
 		cf.Version = int(resp.Config.ConfigVersion)
 		for i := 0; i < common.NBuckets; i++ {
 			cf.Buckets[i] = int(resp.Config.Buckets[i])

diff --git a/metaserver/metaserver_test.go b/metaserver/metaserver_test.go
@@ -51,4 +51,5 @@ func TestAddGroups(t *testing.T) {
 		conf, _ := memConfStm.Query(-1)
 		t.Logf("%v %d", conf, i)
 	}
+	common.RemoveDir("./conf_data")
 }
diff --git a/tests/integration_test.go b/tests/integration_test.go
@@ -160,7 +160,7 @@ func TestClusterSingleShardRwBench(t *testing.T) {
 	// R-W test
 	shardkvcli := shardkvserver.MakeKvClient("127.0.0.1:8088,127.0.0.1:8089,127.0.0.1:8090")
 
-	N := 120
+	N := 64
 	KeySize := 64
 	ValSize := 64
 	benchKvs := map[string]string{}
@@ -227,7 +227,7 @@ func TestClusterRwBench(t *testing.T) {
 	// R-W test
 	shardKVCli := shardkvserver.MakeKvClient("127.0.0.1:8088,127.0.0.1:8089,127.0.0.1:8090")
 
-	N := 100
+	N := 64
 	KeySize := 64
 	ValSize := 64
 	benchKvs := map[string]string{}