Merge pull request #79639 from danielqsj/unr

call unreserve plugin before record event
This commit is contained in:
Kubernetes Prow Robot 2019-07-03 13:52:39 -07:00 committed by GitHub
commit a9b3d7d821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -552,9 +552,9 @@ func (sched *Scheduler) scheduleOne() {
if forgetErr := sched.Cache().ForgetPod(assumedPod); forgetErr != nil {
klog.Errorf("scheduler cache ForgetPod failed: %v", forgetErr)
}
sched.recordSchedulingFailure(assumedPod, permitStatus.AsError(), reason, permitStatus.Message())
// trigger un-reserve plugins to clean up state associated with the reserved Pod
fwk.RunUnreservePlugins(pluginContext, assumedPod, scheduleResult.SuggestedHost)
sched.recordSchedulingFailure(assumedPod, permitStatus.AsError(), reason, permitStatus.Message())
return
}
@ -571,9 +571,9 @@ func (sched *Scheduler) scheduleOne() {
if forgetErr := sched.Cache().ForgetPod(assumedPod); forgetErr != nil {
klog.Errorf("scheduler cache ForgetPod failed: %v", forgetErr)
}
sched.recordSchedulingFailure(assumedPod, prebindStatus.AsError(), reason, prebindStatus.Message())
// trigger un-reserve plugins to clean up state associated with the reserved Pod
fwk.RunUnreservePlugins(pluginContext, assumedPod, scheduleResult.SuggestedHost)
sched.recordSchedulingFailure(assumedPod, prebindStatus.AsError(), reason, prebindStatus.Message())
return
}