Fix wrong caculation for deserved in proportion plugin

zionwu · zionwu · commit 06c442826d2d · 2019-03-27T16:49:26.000+08:00
diff --git a/pkg/scheduler/plugins/proportion/proportion.go b/pkg/scheduler/plugins/proportion/proportion.go
@@ -124,6 +124,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)
@@ -134,7 +135,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
`@@ -124,6 +124,7 @@ func (pp proportionPlugin) OnSessionOpen(ssn framework.Session) {`
`124`	`124`	`continue`
`125`	`125`	`}`
`126`	`126`
	`127`	`+ oldDeserved := attr.deserved.Clone()`
`127`	`128`	`attr.deserved.Add(remaining.Clone().Multi(float64(attr.weight) / float64(totalWeight)))`
`128`	`129`	`if !attr.deserved.LessEqual(attr.request) {`
`129`	`130`	`attr.deserved = helpers.Min(attr.deserved, attr.request)`
`@@ -134,7 +135,7 @@ func (pp proportionPlugin) OnSessionOpen(ssn framework.Session) {`
`134`	`135`	`glog.V(4).Infof("The attributes of queue <%s> in proportion: deserved <%v>, allocate <%v>, request <%v>, share <%0.2f>",`
`135`	`136`	`attr.name, attr.deserved, attr.allocated, attr.request, attr.share)`
`136`	`137`
`137`		`- deserved.Add(attr.deserved)`
	`138`	`+ deserved.Add(attr.deserved.Clone().Sub(oldDeserved))`
`138`	`139`	`}`
`139`	`140`
`140`	`141`	`remaining.Sub(deserved)`