Merge pull request #2420 from Akiqqqqqqq/bugfix-controller-nil-pointer

fix nil pointer in jobCache.update
volcano-sh · Aug 10, 2022 · 76dac4c · 76dac4c
2 parents 98c2c08 + f16976d
commit 76dac4c
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/pkg/controllers/cache/cache.go b/pkg/controllers/cache/cache.go
@@ -154,17 +154,19 @@ func (jc *jobCache) Update(obj *v1alpha1.Job) error {
 		return fmt.Errorf("failed to find job <%v>", key)
 	}
 
-	var oldResourceversion, newResourceversion uint64
-	var err error
-	if oldResourceversion, err = strconv.ParseUint(job.Job.ResourceVersion, 10, 64); err != nil {
-		return fmt.Errorf("failed to parase job <%v> resource version <%s>", key, job.Job.ResourceVersion)
-	}
+	if job.Job != nil {
+		var oldResourceversion, newResourceversion uint64
+		var err error
+		if oldResourceversion, err = strconv.ParseUint(job.Job.ResourceVersion, 10, 64); err != nil {
+			return fmt.Errorf("failed to parase job <%v> resource version <%s>", key, job.Job.ResourceVersion)
+		}
 
-	if newResourceversion, err = strconv.ParseUint(obj.ResourceVersion, 10, 64); err != nil {
-		return fmt.Errorf("failed to parase job <%v> resource version <%s>", key, obj.ResourceVersion)
-	}
-	if newResourceversion < oldResourceversion {
-		return fmt.Errorf("job <%v> has too old resource version: %d (%d)", key, newResourceversion, oldResourceversion)
+		if newResourceversion, err = strconv.ParseUint(obj.ResourceVersion, 10, 64); err != nil {
+			return fmt.Errorf("failed to parase job <%v> resource version <%s>", key, obj.ResourceVersion)
+		}
+		if newResourceversion < oldResourceversion {
+			return fmt.Errorf("job <%v> has too old resource version: %d (%d)", key, newResourceversion, oldResourceversion)
+		}
 	}
 	job.Job = obj
 	return nil