Fix

apache · Sep 13, 2024 · 9d9ef42 · 9d9ef42
1 parent 79561b4
commit 9d9ef42
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/pkg/scheduler/objects/application_state_test.go b/pkg/scheduler/objects/application_state_test.go
@@ -286,6 +286,7 @@ func TestAppStateTransitionEvents(t *testing.T) {
 func TestAppStateTransitionMetrics(t *testing.T) { //nolint:funlen
 	queue := createQueue(t, "metrics")
 	metrics.GetSchedulerMetrics().Reset()
+	metrics.GetQueueMetrics("root.metrics").Reset()
 	// app-00001: New -> Resuming -> Accepted --> Running -> Completing-> Completed
 	app := newApplication("app-00001", "default", "root.metrics")
 	app.SetQueue(queue)

diff --git a/pkg/scheduler/partition_test.go b/pkg/scheduler/partition_test.go
@@ -247,6 +247,9 @@ func TestRemoveNodeWithAllocations(t *testing.T) {
 	partition, err := newBasePartition()
 	assert.NilError(t, err, "partition create failed")
 
+	defer metrics.GetSchedulerMetrics().Reset()
+	defer metrics.GetQueueMetrics(defQueue).Reset()
+
 	// add a new app
 	app := newApplication(appID1, "default", defQueue)
 	err = partition.AddApplication(app)
@@ -294,6 +297,9 @@ func TestRemoveNodeWithPlaceholders(t *testing.T) {
 	partition, err := newBasePartition()
 	assert.NilError(t, err, "partition create failed")
 
+	defer metrics.GetSchedulerMetrics().Reset()
+	defer metrics.GetQueueMetrics(defQueue).Reset()
+
 	// add a new app
 	app := newApplication(appID1, "default", defQueue)
 	err = partition.AddApplication(app)
@@ -396,6 +402,9 @@ func TestPlaceholderDataWithPlaceholderPreemption(t *testing.T) {
 	partition, err := newBasePartition()
 	assert.NilError(t, err, "partition create failed")
 
+	defer metrics.GetSchedulerMetrics().Reset()
+	defer metrics.GetQueueMetrics(defQueue).Reset()
+
 	// add a new app1
 	app1, _ := newApplicationWithHandler(appID1, "default", defQueue)
 	err = partition.AddApplication(app1)
@@ -523,6 +532,9 @@ func TestPlaceholderDataWithNodeRemoval(t *testing.T) {
 	partition, err := newBasePartition()
 	assert.NilError(t, err, "partition create failed")
 
+	defer metrics.GetSchedulerMetrics().Reset()
+	defer metrics.GetQueueMetrics(defQueue).Reset()
+
 	// add a new app1
 	app1, _ := newApplicationWithHandler(appID1, "default", defQueue)
 	err = partition.AddApplication(app1)
@@ -606,6 +618,9 @@ func TestPlaceholderDataWithRemoval(t *testing.T) {
 	partition, err := newBasePartition()
 	assert.NilError(t, err, "partition create failed")
 
+	defer metrics.GetSchedulerMetrics().Reset()
+	defer metrics.GetQueueMetrics(defQueue).Reset()
+
 	// add a new app1
 	app1, _ := newApplicationWithHandler(appID1, "default", defQueue)
 	err = partition.AddApplication(app1)
@@ -699,6 +714,8 @@ func TestRemoveNodeWithReplacement(t *testing.T) {
 	partition, err := newBasePartition()
 	assert.NilError(t, err, "partition create failed")
 
+	defer metrics.GetSchedulerMetrics().Reset()
+	defer metrics.GetQueueMetrics(defQueue).Reset()
 	// add a new app
 	app := newApplication(appID1, "default", defQueue)
 	err = partition.AddApplication(app)
@@ -771,6 +788,9 @@ func TestRemoveNodeWithReal(t *testing.T) {
 	partition, err := newBasePartition()
 	assert.NilError(t, err, "partition create failed")
 
+	defer metrics.GetSchedulerMetrics().Reset()
+	defer metrics.GetQueueMetrics(defQueue).Reset()
+
 	// add a new app
 	app := newApplication(appID1, "default", defQueue)
 	err = partition.AddApplication(app)
@@ -832,6 +852,8 @@ func TestRemoveNodeWithReal(t *testing.T) {
 }
 
 func TestAddApp(t *testing.T) {
+	defer metrics.GetSchedulerMetrics().Reset()
+	defer metrics.GetQueueMetrics(defQueue).Reset()
 	partition, err := newBasePartition()
 	assert.NilError(t, err, "partition create failed")