ソースを参照

discovery: key config -> key _config

Xiang Li 11 年 前
コミット
17068c5110
2 ファイル変更7 行追加7 行削除
  1. 1 1
      discovery/discovery.go
  2. 6 6
      discovery/discovery_test.go

+ 1 - 1
discovery/discovery.go

@@ -69,7 +69,7 @@ func (d *discovery) createSelf() error {
 }
 
 func (d *discovery) checkCluster() (client.Nodes, int, error) {
-	configKey := path.Join("/", d.cluster, "config")
+	configKey := path.Join("/", d.cluster, "_config")
 	// find cluster size
 	resp, err := d.c.Get(path.Join(configKey, "size"))
 	if err != nil {

+ 6 - 6
discovery/discovery_test.go

@@ -25,7 +25,7 @@ func TestCheckCluster(t *testing.T) {
 		{
 			// self is in the size range
 			client.Nodes{
-				{Key: "/1000/config/size", Value: "3", CreatedIndex: 1},
+				{Key: "/1000/_config/size", Value: "3", CreatedIndex: 1},
 				{Key: self, CreatedIndex: 2},
 				{Key: "/1000/2", CreatedIndex: 3},
 				{Key: "/1000/3", CreatedIndex: 4},
@@ -37,7 +37,7 @@ func TestCheckCluster(t *testing.T) {
 		{
 			// self is in the size range
 			client.Nodes{
-				{Key: "/1000/config/size", Value: "3", CreatedIndex: 1},
+				{Key: "/1000/_config/size", Value: "3", CreatedIndex: 1},
 				{Key: "/1000/2", CreatedIndex: 2},
 				{Key: "/1000/3", CreatedIndex: 3},
 				{Key: self, CreatedIndex: 4},
@@ -49,7 +49,7 @@ func TestCheckCluster(t *testing.T) {
 		{
 			// self is out of the size range
 			client.Nodes{
-				{Key: "/1000/config/size", Value: "3", CreatedIndex: 1},
+				{Key: "/1000/_config/size", Value: "3", CreatedIndex: 1},
 				{Key: "/1000/2", CreatedIndex: 2},
 				{Key: "/1000/3", CreatedIndex: 3},
 				{Key: "/1000/4", CreatedIndex: 4},
@@ -61,7 +61,7 @@ func TestCheckCluster(t *testing.T) {
 		{
 			// self is not in the cluster
 			client.Nodes{
-				{Key: "/1000/config/size", Value: "3", CreatedIndex: 1},
+				{Key: "/1000/_config/size", Value: "3", CreatedIndex: 1},
 				{Key: "/1000/2", CreatedIndex: 2},
 				{Key: "/1000/3", CreatedIndex: 3},
 			},
@@ -70,7 +70,7 @@ func TestCheckCluster(t *testing.T) {
 		},
 		{
 			client.Nodes{
-				{Key: "/1000/config/size", Value: "3", CreatedIndex: 1},
+				{Key: "/1000/_config/size", Value: "3", CreatedIndex: 1},
 				{Key: "/1000/2", CreatedIndex: 2},
 				{Key: "/1000/3", CreatedIndex: 3},
 				{Key: "/1000/4", CreatedIndex: 4},
@@ -81,7 +81,7 @@ func TestCheckCluster(t *testing.T) {
 		{
 			// bad size key
 			client.Nodes{
-				{Key: "/1000/config/size", Value: "bad", CreatedIndex: 1},
+				{Key: "/1000/_config/size", Value: "bad", CreatedIndex: 1},
 			},
 			ErrBadSizeKey,
 			0,