Merge pull request #19504 from tcchawla/fix-19500

tests: deflakey TestLeaseGrantKeepAliveOnce

Author: ahrtr

tests/common/lease_test.go

@@ -175,7 +175,7 @@ func TestLeaseGrantKeepAliveOnce(t *testing.T) {
 
 	for _, tc := range clusterTestCases() {
 		t.Run(tc.name, func(t *testing.T) {
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 			defer cancel()
 			clus := testRunner.NewCluster(ctx, t, config.WithClusterConfig(tc.config))
 			defer clus.Close()
@@ -188,7 +188,23 @@ func TestLeaseGrantKeepAliveOnce(t *testing.T) {
 				_, err = cc.KeepAliveOnce(ctx, leaseResp.ID)
 				require.NoError(t, err)
 
-				time.Sleep(2 * time.Second) // Wait for the original lease to expire
+				// FIXME: When leader changes, old leader steps
+				// back to follower and ignores the lease revoking.
+				// The new leader will restart TTL counting. If so,
+				// we should call time.Sleep again and wait for revoking.
+				// It can't avoid flakey but reduce flakey possiblility.
+				for i := 0; i < 3; i++ {
+					currentLeader := clus.WaitLeader(t)
+					t.Logf("[%d] current leader index %d", i, currentLeader)
+
+					time.Sleep(2 * time.Second)
+
+					newLeader := clus.WaitLeader(t)
+					if newLeader == currentLeader {
+						break
+					}
+					t.Logf("[%d] leader changed, new leader index %d", i, newLeader)
+				}
 
 				ttlResp, err := cc.TimeToLive(ctx, leaseResp.ID, config.LeaseOption{})
 				require.NoError(t, err)