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
This commit is contained in:
Gyu-Ho Lee
2016-08-17 10:30:25 -07:00
parent e7a7fb2bb1
commit f2fedbae9b

View File

@ -50,7 +50,9 @@ func TestNetworkPartition5MembersLeaderInMinority(t *testing.T) {
// recover network partition (bi-directional) // recover network partition (bi-directional)
recoverPartition(t, minorityMembers, majorityMembers) recoverPartition(t, minorityMembers, majorityMembers)
clusterMustProgress(t, clus.Members)
// write to majority first
clusterMustProgress(t, append(majorityMembers, minorityMembers...))
} }
func TestNetworkPartition5MembersLeaderInMajority(t *testing.T) { func TestNetworkPartition5MembersLeaderInMajority(t *testing.T) {
@ -86,7 +88,9 @@ func TestNetworkPartition5MembersLeaderInMajority(t *testing.T) {
// recover network partition (bi-directional) // recover network partition (bi-directional)
recoverPartition(t, majorityMembers, minorityMembers) recoverPartition(t, majorityMembers, minorityMembers)
clusterMustProgress(t, clus.Members)
// write to majority first
clusterMustProgress(t, append(majorityMembers, minorityMembers...))
} }
func TestNetworkPartition4Members(t *testing.T) { func TestNetworkPartition4Members(t *testing.T) {
@ -112,6 +116,10 @@ func TestNetworkPartition4Members(t *testing.T) {
// recover network partition (bi-directional) // recover network partition (bi-directional)
recoverPartition(t, leaderPartition, followerPartition) recoverPartition(t, leaderPartition, followerPartition)
// need to wait since it recovered with no leader
clus.WaitLeader(t)
clusterMustProgress(t, clus.Members) clusterMustProgress(t, clus.Members)
} }