test fix

Author: JulyWindK

pkg/agent/qrm-plugins/memory/dynamicpolicy/userwatermark/calculator_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package userwatermark
 
 import (
-	"sync"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -33,8 +32,6 @@ const (
 	TestSingleReclaimSize    = 4096
 )
 
-var calculatorMutex sync.Mutex
-
 func NewDefaultMemoryWatermarkCalculator() *WatermarkCalculator {
 	return NewMemoryWatermarkCalculator(TestCGroupPath, TestWatermarkScaleFactor, TestSingleReclaimFactor, TestSingleReclaimSize)
 }

pkg/agent/qrm-plugins/memory/dynamicpolicy/userwatermark/manager_test.go

@@ -39,7 +39,9 @@ import (
 	"github.com/kubewharf/katalyst-core/pkg/util/native"
 )
 
-var managerMutex sync.Mutex
+// mockey maintains a process-wide patch registry; Patch/UnPatchAll is not race-safe.
+// Guard all mockey usage in this package even when tests use t.Parallel().
+var mockeyMutex sync.Mutex
 
 func generateUserWatermarkTestMetaServer(pods []*v1.Pod) *metaserver.MetaServer {
 	podFetcher := &metapod.PodFetcherStub{PodList: pods}
@@ -87,8 +89,8 @@ func TestUserWatermarkReclaimManager_Reconcile_Disabled(t *testing.T) {
 
 func TestUserWatermarkReclaimManager_Reconcile_CreateReclaimers(t *testing.T) {
 	t.Parallel()
-	managerMutex.Lock()
-	defer managerMutex.Unlock()
+	mockeyMutex.Lock()
+	defer mockeyMutex.Unlock()
 
 	defer mockey.UnPatchAll()
 	qosConfig := generic.NewQoSConfiguration()
@@ -151,8 +153,8 @@ func TestUserWatermarkReclaimManager_Reconcile_CreateReclaimers(t *testing.T) {
 
 func TestUserWatermarkReclaimManager_Reconcile_GetPodListError(t *testing.T) {
 	t.Parallel()
-	managerMutex.Lock()
-	defer managerMutex.Unlock()
+	mockeyMutex.Lock()
+	defer mockeyMutex.Unlock()
 
 	defer mockey.UnPatchAll()
 

pkg/agent/qrm-plugins/memory/dynamicpolicy/userwatermark/reclaimer_test.go

@@ -19,7 +19,6 @@ package userwatermark
 import (
 	"context"
 	"fmt"
-	"sync"
 	"testing"
 	"time"
 
@@ -37,8 +36,6 @@ import (
 	"github.com/kubewharf/katalyst-core/pkg/util/machine"
 )
 
-var reclaimMutex = sync.Mutex{}
-
 func newTestDynamicConf() *dynamicconfig.DynamicAgentConfiguration {
 	// NewDynamicAgentConfiguration already initializes a non-nil
 	// UserWatermarkConfiguration via NewConfiguration().
@@ -208,8 +205,8 @@ func TestGetContainerCgroupPath_SuccessAndError(t *testing.T) {
 
 	t.Run("success", func(t *testing.T) {
 		t.Parallel()
-		reclaimMutex.Lock()
-		defer reclaimMutex.Unlock()
+		mockeyMutex.Lock()
+		defer mockeyMutex.Unlock()
 
 		defer mockey.UnPatchAll()
 
@@ -223,8 +220,8 @@ func TestGetContainerCgroupPath_SuccessAndError(t *testing.T) {
 
 	t.Run("error", func(t *testing.T) {
 		t.Parallel()
-		reclaimMutex.Lock()
-		defer reclaimMutex.Unlock()
+		mockeyMutex.Lock()
+		defer mockeyMutex.Unlock()
 
 		defer mockey.UnPatchAll()
 
@@ -242,8 +239,8 @@ func TestGetCGroupMemoryLimitAndUsage(t *testing.T) {
 
 	t.Run("success", func(t *testing.T) {
 		t.Parallel()
-		reclaimMutex.Lock()
-		defer reclaimMutex.Unlock()
+		mockeyMutex.Lock()
+		defer mockeyMutex.Unlock()
 
 		defer mockey.UnPatchAll()
 
@@ -258,8 +255,8 @@ func TestGetCGroupMemoryLimitAndUsage(t *testing.T) {
 
 	t.Run("error", func(t *testing.T) {
 		t.Parallel()
-		reclaimMutex.Lock()
-		defer reclaimMutex.Unlock()
+		mockeyMutex.Lock()
+		defer mockeyMutex.Unlock()
 
 		defer mockey.UnPatchAll()
 
@@ -273,8 +270,8 @@ func TestGetCGroupMemoryLimitAndUsage(t *testing.T) {
 
 	t.Run("nilStats", func(t *testing.T) {
 		t.Parallel()
-		reclaimMutex.Lock()
-		defer reclaimMutex.Unlock()
+		mockeyMutex.Lock()
+		defer mockeyMutex.Unlock()
 
 		defer mockey.UnPatchAll()
 
@@ -292,8 +289,8 @@ func TestGetCGroupMemoryStats(t *testing.T) {
 
 	t.Run("success", func(t *testing.T) {
 		t.Parallel()
-		reclaimMutex.Lock()
-		defer reclaimMutex.Unlock()
+		mockeyMutex.Lock()
+		defer mockeyMutex.Unlock()
 
 		defer mockey.UnPatchAll()
 
@@ -321,8 +318,8 @@ func TestGetCGroupMemoryStats(t *testing.T) {
 
 	t.Run("error", func(t *testing.T) {
 		t.Parallel()
-		reclaimMutex.Lock()
-		defer reclaimMutex.Unlock()
+		mockeyMutex.Lock()
+		defer mockeyMutex.Unlock()
 
 		defer mockey.UnPatchAll()
 
@@ -350,12 +347,8 @@ func TestReachedHighWatermark(t *testing.T) {
 
 func TestUserWatermarkReclaimer_ReclaimSuccess(t *testing.T) {
 	t.Parallel()
-	calculatorMutex.Lock()
-	defer calculatorMutex.Unlock()
-	managerMutex.Lock()
-	defer managerMutex.Unlock()
-	reclaimMutex.Lock()
-	defer reclaimMutex.Unlock()
+	mockeyMutex.Lock()
+	defer mockeyMutex.Unlock()
 
 	defer mockey.UnPatchAll()
 
@@ -430,8 +423,8 @@ func TestUserWatermarkReclaimer_ReclaimSuccess(t *testing.T) {
 
 func TestUserWatermarkReclaimer_ReclaimGetStatsFailed(t *testing.T) {
 	t.Parallel()
-	reclaimMutex.Lock()
-	defer reclaimMutex.Unlock()
+	mockeyMutex.Lock()
+	defer mockeyMutex.Unlock()
 
 	defer mockey.UnPatchAll()