From e4c474bdfca5c4430d3e0b0a3793f11bcd046b94 Mon Sep 17 00:00:00 2001 From: Zexi Date: Tue, 2 Jul 2019 20:33:22 +0800 Subject: [PATCH] scheduler: fix network schedtag not set capacity --- .../algorithm/predicates/network_schedtag_predicate.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/scheduler/algorithm/predicates/network_schedtag_predicate.go b/pkg/scheduler/algorithm/predicates/network_schedtag_predicate.go index cc88de0f0e..a2143f9d52 100644 --- a/pkg/scheduler/algorithm/predicates/network_schedtag_predicate.go +++ b/pkg/scheduler/algorithm/predicates/network_schedtag_predicate.go @@ -75,7 +75,7 @@ func (p *NetworkSchedtagPredicate) GetResources(c core.Candidater) []ISchedtagCa return ret } -func (p *NetworkSchedtagPredicate) IsResourceFitInput(u *core.Unit, _ core.Candidater, res ISchedtagCandidateResource, input ISchedtagCustomer) error { +func (p *NetworkSchedtagPredicate) IsResourceFitInput(u *core.Unit, c core.Candidater, res ISchedtagCandidateResource, input ISchedtagCustomer) error { network := res.(*api.CandidateNetwork) net := input.(*netW) if net.Network != "" { @@ -133,6 +133,8 @@ func (p *NetworkSchedtagPredicate) IsResourceFitInput(u *core.Unit, _ core.Candi if free < req { return fmt.Errorf("Network %s no free IPs, free %d, require %d", network.Name, free, req) } + h := NewPredicateHelper(p, u, c) + h.SetCapacity(int64(free)) return nil }