Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

discovery: key config -> key _config

Browse Source
This commit is contained in:
Xiang Li 2014-09-22 14:25:35 -07:00
parent 6081311db5
commit 17068c5110
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
discovery/discovery.go
View File

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

12
discovery/discovery_test.go
View File

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