Merge pull request #19541 from k8s-infra-cherrypick-robot/cherry-pick-19538-to-release-3.6

ahrtr · web-flow · commit 90f607af013e · 2025-03-06T08:00:26.000Z
[release-3.6] deflakey: TestCompactionHash in integration
diff --git a/tests/integration/hashkv_test.go b/tests/integration/hashkv_test.go
@@ -19,7 +19,6 @@ import (
 	"net"
 	"net/http"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -78,8 +77,6 @@ func (tc hashTestCase) Defrag(ctx context.Context) error {
 }
 
 func (tc hashTestCase) Compact(ctx context.Context, rev int64) error {
-	_, err := tc.Client.Compact(ctx, rev)
-	// Wait for compaction to be compacted
-	time.Sleep(50 * time.Millisecond)
+	_, err := tc.Client.Compact(ctx, rev, clientv3.WithCompactPhysical())
 	return err
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ import (`
`19`	`19`	`"net"`
`20`	`20`	`"net/http"`
`21`	`21`	`"testing"`
`22`		`- "time"`
`23`	`22`
`24`	`23`	`"github.com/stretchr/testify/require"`
`25`	`24`
`@@ -78,8 +77,6 @@ func (tc hashTestCase) Defrag(ctx context.Context) error {`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`func (tc hashTestCase) Compact(ctx context.Context, rev int64) error {`
`81`		`- _, err := tc.Client.Compact(ctx, rev)`
`82`		`- // Wait for compaction to be compacted`
`83`		`- time.Sleep(50 * time.Millisecond)`
	`80`	`+ _, err := tc.Client.Compact(ctx, rev, clientv3.WithCompactPhysical())`
`84`	`81`	`return err`
`85`	`82`	`}`