Merge branch 'feature/support-admission-test' of https://github.com/volcano-sh/volcano into feature/support-admission-test

Author: TommyLike

Makefile

@@ -1,6 +1,8 @@
 BIN_DIR=_output/bin
-export IMAGE=volcano
-export TAG = 1.0
+IMAGE=volcano
+TAG = 0.1
+
+.EXPORT_ALL_VARIABLES:
 
 all: controllers scheduler cli admission
 

pkg/controllers/job/cache/cache.go

@@ -231,6 +231,9 @@ func (jc *jobCache) Run(stopCh <-chan struct{}) {
 }
 
 func (jc jobCache) TaskCompleted(jobKey, taskName string) bool {
+	jc.Lock()
+	defer jc.Unlock()
+
 	var taskReplicas, completed int32
 
 	jobInfo, found := jc.jobs[jobKey]

pkg/scheduler/actions/preempt/preempt.go

@@ -232,10 +232,9 @@ func preempt(
 			}
 			preempted.Add(preemptee.Resreq)
 			// If reclaimed enough resources, break loop to avoid Sub panic.
-			if resreq.LessEqual(preemptee.Resreq) {
+			if resreq.LessEqual(preempted) {
 				break
 			}
-			resreq.Sub(preemptee.Resreq)
 		}
 
 		metrics.RegisterPreemptionAttempts()

pkg/scheduler/actions/reclaim/reclaim.go

@@ -166,10 +166,9 @@ func (alloc *reclaimAction) Execute(ssn *framework.Session) {
 				}
 				reclaimed.Add(reclaimee.Resreq)
 				// If reclaimed enough resources, break loop to avoid Sub panic.
-				if resreq.LessEqual(reclaimee.Resreq) {
+				if resreq.LessEqual(reclaimed) {
 					break
 				}
-				resreq.Sub(reclaimee.Resreq)
 			}
 
 			glog.V(3).Infof("Reclaimed <%v> for task <%s/%s> requested <%v>.",

test/e2e/util.go

@@ -295,7 +295,6 @@ type jobSpec struct {
 	tasks     []taskSpec
 	policies  []vkv1.LifecyclePolicy
 	min       int32
-	version   int32
 }
 
 func getNS(context *context, job *jobSpec) string {
@@ -376,10 +375,6 @@ func createJobInner(context *context, jobSpec *jobSpec) (*vkv1.Job, error) {
 		min += task.min
 	}
 
-	if jobSpec.version > 0 {
-		job.Status.Version = jobSpec.version
-	}
-
 	if jobSpec.min > 0 {
 		job.Spec.MinAvailable = jobSpec.min
 	} else {