fix comment

kubeflow · Feb 3, 2022 · 1aef17b · 1aef17b
1 parent 9569def
commit 1aef17b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/pkg/controller.v1/common/job.go b/pkg/controller.v1/common/job.go
@@ -241,7 +241,7 @@ func (jc *JobController) ReconcileJobs(
 				minResources = jc.calcPGMinResources(minMember, replicas)
 			}
 
-			var pgSpecFill PGFillSpecFunc = nil
+			var pgSpecFill FillPodGroupSpecFunc = nil
 			switch jc.Config.GangScheduling {
 			case GangSchedulerVolcano:
 				pgSpecFill = func(pg metav1.Object) error {

diff --git a/pkg/controller.v1/common/pod.go b/pkg/controller.v1/common/pod.go
@@ -421,7 +421,7 @@ func (jc *JobController) createNewPod(job interface{}, rt string, index int, spe
 	// 1. if user has specified other scheduler, we report a warning without overriding any fields.
 	// 2. if no SchedulerName is set for pods, then we set the SchedulerName to "volcano" or "scheduler-plugins-scheduler".
 	if jc.Config.EnableGangScheduling() {
-		if isAnotherGangSchedulerSet(replicas, jc.PodGroupControl.GetSchedulerName()) {
+		if isCustomSchedulerSet(replicas, jc.PodGroupControl.GetSchedulerName()) {
 			errMsg := "Another scheduler is specified when gang-scheduling is enabled and it will not be overwritten"
 			logger.Warning(errMsg)
 			jc.Recorder.Event(runtimeObject, v1.EventTypeWarning, podTemplateSchedulerNameReason, errMsg)
@@ -456,7 +456,7 @@ func (jc *JobController) createNewPod(job interface{}, rt string, index int, spe
 	return nil
 }
 
-func isAnotherGangSchedulerSet(replicas map[apiv1.ReplicaType]*apiv1.ReplicaSpec, gangSchedulerName string) bool {
+func isCustomSchedulerSet(replicas map[apiv1.ReplicaType]*apiv1.ReplicaSpec, gangSchedulerName string) bool {
 	for _, spec := range replicas {
 		if spec.Template.Spec.SchedulerName != "" && spec.Template.Spec.SchedulerName != gangSchedulerName {
 			return true

diff --git a/pkg/controller.v1/common/pod_test.go b/pkg/controller.v1/common/pod_test.go
@@ -67,10 +67,10 @@ func TestSetRestartPolicy(t *testing.T) {
 	}
 }
 
-func TestIsAnotherGangSchedulerSet(t *testing.T) {
+func TestIsCustomSchedulerSet(t *testing.T) {
 	gangSchedulerName := "test-gang-scheduler"
 	replicaSpecs := map[apiv1.ReplicaType]*apiv1.ReplicaSpec{}
-	assert.False(t, isAnotherGangSchedulerSet(replicaSpecs, gangSchedulerName))
+	assert.False(t, isCustomSchedulerSet(replicaSpecs, gangSchedulerName))
 
 	replicaSpecs[apiv1.ReplicaType(testjobv1.TestReplicaTypeWorker)] = &apiv1.ReplicaSpec{
 		Template: v1.PodTemplateSpec{
@@ -79,7 +79,7 @@ func TestIsAnotherGangSchedulerSet(t *testing.T) {
 			},
 		},
 	}
-	assert.False(t, isAnotherGangSchedulerSet(replicaSpecs, gangSchedulerName))
+	assert.False(t, isCustomSchedulerSet(replicaSpecs, gangSchedulerName))
 
 	replicaSpecs[apiv1.ReplicaType(testjobv1.TestReplicaTypeWorker)] = &apiv1.ReplicaSpec{
 		Template: v1.PodTemplateSpec{
@@ -88,7 +88,7 @@ func TestIsAnotherGangSchedulerSet(t *testing.T) {
 			},
 		},
 	}
-	assert.True(t, isAnotherGangSchedulerSet(replicaSpecs, gangSchedulerName))
+	assert.True(t, isCustomSchedulerSet(replicaSpecs, gangSchedulerName))
 }
 
 func TestCalculatePodSliceSize(t *testing.T) {

diff --git a/pkg/controller.v1/common/scheduling.go b/pkg/controller.v1/common/scheduling.go
@@ -28,9 +28,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
-type PGFillSpecFunc func(object metav1.Object) error
+type FillPodGroupSpecFunc func(object metav1.Object) error
 
-func (jc *JobController) SyncPodGroup(job metav1.Object, specFunc PGFillSpecFunc) (metav1.Object, error) {
+func (jc *JobController) SyncPodGroup(job metav1.Object, specFunc FillPodGroupSpecFunc) (metav1.Object, error) {
 
 	pgctl := jc.PodGroupControl
 	// Check whether podGroup exists or not