From 095d424d3ede972813e39ae15849ffaa8e1c5ad3 Mon Sep 17 00:00:00 2001 From: auxten Date: Tue, 22 Jan 2019 20:44:19 +0800 Subject: [PATCH 1/2] GetCurrentBP also return BP follower --- rpc/rpcutil.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rpc/rpcutil.go b/rpc/rpcutil.go index 10b7a4650..2c4763e0c 100644 --- a/rpc/rpcutil.go +++ b/rpc/rpcutil.go @@ -356,8 +356,7 @@ func GetCurrentBP() (bpNodeID proto.NodeID, err error) { ID: localNodeID, Roles: []proto.ServerRole{ proto.Leader, - // only leader is capable of allocating database in current implementation - //proto.Follower, + proto.Follower, }, Count: 1, } From 0117b4f9971ab9f4a98ae8b916524b2536758c66 Mon Sep 17 00:00:00 2001 From: Qi Xiao Date: Mon, 28 Jan 2019 18:47:05 +0800 Subject: [PATCH 2/2] Set current bp to leader bp after bp kills on cqld_test --- cmd/cqld/cqld_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/cqld/cqld_test.go b/cmd/cqld/cqld_test.go index 7d3c267b6..bbadb0ae3 100644 --- a/cmd/cqld/cqld_test.go +++ b/cmd/cqld/cqld_test.go @@ -72,6 +72,9 @@ func TestCQLD(t *testing.T) { So(err, ShouldBeNil) time.Sleep(15 * time.Second) + // set current bp to leader bp + rpc.SetCurrentBP(route.GetBPs()[0]) + // The other peers should be waiting var ( req = &types.FetchLastIrreversibleBlockReq{}