From a3197102e9b8b42fcf745ae5e4166b93f3b00095 Mon Sep 17 00:00:00 2001 From: Benjamin Wang Date: Wed, 23 Nov 2022 13:21:12 +0800 Subject: [PATCH] test: rollback the change in PR pull/14824 The change did in https://github.com/etcd-io/etcd/pull/14824 fixed the test instead of the product code. It isn't correct. After we fixed the product code in this PR, we can revert the change in that PR. Signed-off-by: Benjamin Wang --- tests/integration/corrupt_test.go | 38 ++----------------------------- 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/tests/integration/corrupt_test.go b/tests/integration/corrupt_test.go index ee2474a23..ee98a24fb 100644 --- a/tests/integration/corrupt_test.go +++ b/tests/integration/corrupt_test.go @@ -93,30 +93,13 @@ func TestPeriodicCheckDetectsCorruption(t *testing.T) { time.Sleep(50 * time.Millisecond) leader := clus.WaitLeader(t) - // Get sorted member IDs - members, err := cc.MemberList(ctx) - assert.NoError(t, err, "error on member list %v") - - // NOTE: If the corrupted member has been elected as leader, the - // alarm will show the smaller member. - var expectedID = uint64(clus.Members[0].ID()) - if leader == 0 { - for _, m := range members.Members { - if m.Name != clus.Members[0].Name { - expectedID = m.ID - break - } - } - - } - err = clus.Members[leader].Server.CorruptionChecker().PeriodicCheck() assert.NoError(t, err, "error on periodic check") time.Sleep(50 * time.Millisecond) alarmResponse, err := cc.AlarmList(ctx) assert.NoError(t, err, "error on alarm list") - assert.Equal(t, []*etcdserverpb.AlarmMember{{Alarm: etcdserverpb.AlarmType_CORRUPT, MemberID: expectedID}}, alarmResponse.Alarms) + assert.Equal(t, []*etcdserverpb.AlarmMember{{Alarm: etcdserverpb.AlarmType_CORRUPT, MemberID: uint64(clus.Members[0].ID())}}, alarmResponse.Alarms) } func TestCompactHashCheck(t *testing.T) { @@ -186,26 +169,9 @@ func TestCompactHashCheckDetectCorruption(t *testing.T) { time.Sleep(50 * time.Millisecond) leader := clus.WaitLeader(t) - // Get sorted member IDs - members, err := cc.MemberList(ctx) - assert.NoError(t, err, "error on member list %v") - - // NOTE: If the corrupted member has been elected as leader, the - // alarm will show the smaller member. - var expectedID = uint64(clus.Members[0].ID()) - if leader == 0 { - for _, m := range members.Members { - if m.Name != clus.Members[0].Name { - expectedID = m.ID - break - } - } - - } - clus.Members[leader].Server.CorruptionChecker().CompactHashCheck() time.Sleep(50 * time.Millisecond) alarmResponse, err := cc.AlarmList(ctx) assert.NoError(t, err, "error on alarm list") - assert.Equal(t, []*etcdserverpb.AlarmMember{{Alarm: etcdserverpb.AlarmType_CORRUPT, MemberID: expectedID}}, alarmResponse.Alarms) + assert.Equal(t, []*etcdserverpb.AlarmMember{{Alarm: etcdserverpb.AlarmType_CORRUPT, MemberID: uint64(clus.Members[0].ID())}}, alarmResponse.Alarms) }