From d78345244bbc52d2a679800fac7aa409f2c84e14 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Thu, 7 Apr 2016 16:23:31 -0700 Subject: [PATCH] *: log, expect by capability check --- e2e/ctl_v2_test.go | 4 ---- e2e/etcd_test.go | 2 +- etcdserver/api/v2http/capability.go | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/e2e/ctl_v2_test.go b/e2e/ctl_v2_test.go index 76b127fcb..394203d71 100644 --- a/e2e/ctl_v2_test.go +++ b/e2e/ctl_v2_test.go @@ -169,10 +169,6 @@ func testCtlV2GetRoleUser(t *testing.T, cfg *etcdProcessClusterConfig) { } }() - // wait for the server capabilities to be updated based on the version; - // the update loop has a delay of 500ms, so 1s should be enough wait time - time.Sleep(time.Second) - if err := etcdctlRoleAdd(epc, "foo"); err != nil { t.Fatalf("failed to add role (%v)", err) } diff --git a/e2e/etcd_test.go b/e2e/etcd_test.go index 86c4d80ef..b12f7d714 100644 --- a/e2e/etcd_test.go +++ b/e2e/etcd_test.go @@ -252,7 +252,7 @@ func newEtcdProcessCluster(cfg *etcdProcessClusterConfig) (*etcdProcessCluster, // wait for cluster to start readyC := make(chan error, cfg.clusterSize+cfg.proxySize) - readyStr := "membership: set the initial cluster version to" + readyStr := "enabled capabilities for version" for i := range etcdCfgs { go func(etcdp *etcdProcess) { rs := readyStr diff --git a/etcdserver/api/v2http/capability.go b/etcdserver/api/v2http/capability.go index 73361ef20..40477cac0 100644 --- a/etcdserver/api/v2http/capability.go +++ b/etcdserver/api/v2http/capability.go @@ -63,6 +63,7 @@ func capabilityLoop(s *etcdserver.EtcdServer) { enableMapMu.Lock() enabledMap = capabilityMaps[pv.String()] enableMapMu.Unlock() + plog.Infof("enabled capabilities for version %s", pv) } select {