Merge pull request #16549 from fuweid/deflake-test-TestHashKVWhenComp…

…acting server/storage/mvcc: deflake TestHashKVWhenCompacting
etcd-io · Sep 6, 2023 · e5638d9 · e5638d9
2 parents 70fd494 + a6f7bbe
commit e5638d9
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/server/storage/mvcc/kvstore_test.go b/server/storage/mvcc/kvstore_test.go
@@ -591,18 +591,17 @@ func TestHashKVWhenCompacting(t *testing.T) {
 		defer wg.Done()
 		revHash := make(map[int64]uint32)
 		for {
-			r := <-hashCompactc
-			if revHash[r.compactRev] == 0 {
-				revHash[r.compactRev] = r.hash
-			}
-			if r.hash != revHash[r.compactRev] {
-				t.Errorf("Hashes differ (current %v) != (saved %v)", r.hash, revHash[r.compactRev])
-			}
-
 			select {
+			case r := <-hashCompactc:
+				if revHash[r.compactRev] == 0 {
+					revHash[r.compactRev] = r.hash
+				}
+
+				if r.hash != revHash[r.compactRev] {
+					t.Errorf("Hashes differ (current %v) != (saved %v)", r.hash, revHash[r.compactRev])
+				}
 			case <-donec:
 				return
-			default:
 			}
 		}
 	}()