From f2fedbae9bc4882000409baa4992dea111f1c9fb Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Wed, 17 Aug 2016 10:30:25 -0700 Subject: [PATCH] integration: write to leader group first, or wait Write to leader group first, or give more time to acknowledge the leader after network partition recovery --- integration/network_partition_test.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/integration/network_partition_test.go b/integration/network_partition_test.go index 0656bb00c..c4d00642b 100644 --- a/integration/network_partition_test.go +++ b/integration/network_partition_test.go @@ -50,7 +50,9 @@ func TestNetworkPartition5MembersLeaderInMinority(t *testing.T) { // recover network partition (bi-directional) recoverPartition(t, minorityMembers, majorityMembers) - clusterMustProgress(t, clus.Members) + + // write to majority first + clusterMustProgress(t, append(majorityMembers, minorityMembers...)) } func TestNetworkPartition5MembersLeaderInMajority(t *testing.T) { @@ -86,7 +88,9 @@ func TestNetworkPartition5MembersLeaderInMajority(t *testing.T) { // recover network partition (bi-directional) recoverPartition(t, majorityMembers, minorityMembers) - clusterMustProgress(t, clus.Members) + + // write to majority first + clusterMustProgress(t, append(majorityMembers, minorityMembers...)) } func TestNetworkPartition4Members(t *testing.T) { @@ -112,6 +116,10 @@ func TestNetworkPartition4Members(t *testing.T) { // recover network partition (bi-directional) recoverPartition(t, leaderPartition, followerPartition) + + // need to wait since it recovered with no leader + clus.WaitLeader(t) + clusterMustProgress(t, clus.Members) }