change wait dependson job log level to error

Signed-off-by: Ren <rwl1212@126.com>
gj409237405 · Jun 25, 2023 · 6d0ab3b · 6d0ab3b
1 parent 7a9f1ba
commit 6d0ab3b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/cmd/controller-manager/app/options/options.go b/cmd/controller-manager/app/options/options.go
@@ -18,9 +18,10 @@ package options
 
 import (
 	"fmt"
-	"github.com/spf13/pflag"
 	"os"
 
+	"github.com/spf13/pflag"
+
 	"volcano.sh/volcano/pkg/kube"
 )
 

diff --git a/cmd/controller-manager/app/options/options_test.go b/cmd/controller-manager/app/options/options_test.go
@@ -46,15 +46,14 @@ func TestAddFlags(t *testing.T) {
 			QPS:        defaultQPS,
 			Burst:      200,
 		},
-		PrintVersion:                   false,
-		WorkerThreads:                  defaultWorkers,
-		SchedulerNames:                 []string{"volcano", "volcano2"},
-		MaxRequeueNum:                  defaultMaxRequeueNum,
-		HealthzBindAddress:             ":11251",
-		DetectionPeriodOfDependsOntask: defaultDetectionPeriodOfDependsOntask,
-		InheritOwnerAnnotations:        true,
-		EnableLeaderElection:           true,
-		LockObjectNamespace:            defaultLockObjectNamespace,
+		PrintVersion:            false,
+		WorkerThreads:           defaultWorkers,
+		SchedulerNames:          []string{"volcano", "volcano2"},
+		MaxRequeueNum:           defaultMaxRequeueNum,
+		HealthzBindAddress:      ":11251",
+		InheritOwnerAnnotations: true,
+		EnableLeaderElection:    true,
+		LockObjectNamespace:     defaultLockObjectNamespace,
 	}
 
 	if !reflect.DeepEqual(expected, s) {

diff --git a/pkg/controllers/job/job_controller_actions.go b/pkg/controllers/job/job_controller_actions.go
@@ -378,7 +378,7 @@ func (cc *jobcontroller) syncJob(jobInfo *apis.JobInfo, updateStatus state.Updat
 			taskIndex := jobhelpers.GetTasklndexUnderJob(taskName, job)
 			if job.Spec.Tasks[taskIndex].DependsOn != nil {
 				if !cc.waitDependsOnTaskMeetCondition(taskName, taskIndex, podToCreateEachTask, job) {
-					klog.V(4).Infof("Job %s/%s depends on task not ready", job.Name, job.Namespace)
+					klog.V(3).Infof("Job %s/%s depends on task not ready", job.Name, job.Namespace)
 					// release wait group
 					for _, pod := range podToCreateEachTask {
 						go func(pod *v1.Pod) {
@@ -491,22 +491,22 @@ func (cc *jobcontroller) waitDependsOnTaskMeetCondition(taskName string, taskInd
 	}
 	dependsOn := *job.Spec.Tasks[taskIndex].DependsOn
 	if len(dependsOn.Name) > 1 && dependsOn.Iteration == batch.IterationAny {
-		// any ready to create task
+		// any ready to create task, return true
 		for _, task := range dependsOn.Name {
 			if cc.isDependsOnPodsReady(task, job) {
 				return true
 			}
 		}
+		// all not ready to skip create task, return false
 		return false
-	} else {
-		for _, dependsOnTask := range dependsOn.Name {
-			// any not ready to skip
-			if !cc.isDependsOnPodsReady(dependsOnTask, job) {
-				return false
-			}
-			return true
+	}
+	for _, dependsOnTask := range dependsOn.Name {
+		// any not ready to skip create task, return false
+		if !cc.isDependsOnPodsReady(dependsOnTask, job) {
+			return false
 		}
 	}
+	// all ready to create task, return true
 	return true
 }
 

diff --git a/pkg/controllers/job/job_controller_util.go b/pkg/controllers/job/job_controller_util.go
@@ -18,6 +18,7 @@ package job
 
 import (
 	"fmt"
+
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"