Merge pull request #666 from zionwu/fix_deserved_cal

k8s-ci-robot · web-flow · commit 6706f58b99b0 · 2019-03-27T16:28:50.000-07:00
Fix wrong caculation for deserved in proportion plugin
diff --git a/pkg/scheduler/plugins/proportion/proportion.go b/pkg/scheduler/plugins/proportion/proportion.go
@@ -122,6 +122,7 @@ func (pp *proportionPlugin) OnSessionOpen(ssn *framework.Session) {
 				continue
 			}
 
+			oldDeserved := attr.deserved.Clone()
 			attr.deserved.Add(remaining.Clone().Multi(float64(attr.weight) / float64(totalWeight)))
 			if !attr.deserved.LessEqual(attr.request) {
 				attr.deserved = helpers.Min(attr.deserved, attr.request)
@@ -132,7 +133,7 @@ func (pp *proportionPlugin) OnSessionOpen(ssn *framework.Session) {
 			glog.V(4).Infof("The attributes of queue <%s> in proportion: deserved <%v>, allocate <%v>, request <%v>, share <%0.2f>",
 				attr.name, attr.deserved, attr.allocated, attr.request, attr.share)
 
-			deserved.Add(attr.deserved)
+			deserved.Add(attr.deserved.Clone().Sub(oldDeserved))
 		}
 
 		remaining.Sub(deserved)

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ func (pp proportionPlugin) OnSessionOpen(ssn framework.Session) {`
`122`	`122`	`continue`
`123`	`123`	`}`
`124`	`124`
	`125`	`+ oldDeserved := attr.deserved.Clone()`
`125`	`126`	`attr.deserved.Add(remaining.Clone().Multi(float64(attr.weight) / float64(totalWeight)))`
`126`	`127`	`if !attr.deserved.LessEqual(attr.request) {`
`127`	`128`	`attr.deserved = helpers.Min(attr.deserved, attr.request)`
`@@ -132,7 +133,7 @@ func (pp proportionPlugin) OnSessionOpen(ssn framework.Session) {`
`132`	`133`	`glog.V(4).Infof("The attributes of queue <%s> in proportion: deserved <%v>, allocate <%v>, request <%v>, share <%0.2f>",`
`133`	`134`	`attr.name, attr.deserved, attr.allocated, attr.request, attr.share)`
`134`	`135`
`135`		`- deserved.Add(attr.deserved)`
	`136`	`+ deserved.Add(attr.deserved.Clone().Sub(oldDeserved))`
`136`	`137`	`}`
`137`	`138`
`138`	`139`	`remaining.Sub(deserved)`