github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use runtime.NumCPU() instead of a fixed value for parallel scheduler threads.

pull/564/head
Bobby (Babak) Salamat 2019-02-11 13:37:30 -08:00
parent f7c4389b79
commit d0ebeefbc4
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/scheduler/algorithm/predicates/metadata.go
View File

@ -19,6 +19,7 @@ package predicates
import ( import (
"context" "context"
"fmt" "fmt"
"runtime"
"sync" "sync"
"k8s.io/klog" "k8s.io/klog"
@ -415,7 +416,7 @@ func getTPMapMatchingExistingAntiAffinity(pod *v1.Pod, nodeInfoMap map[string]*s
appendTopologyPairsMaps(existingPodTopologyMaps) appendTopologyPairsMaps(existingPodTopologyMaps)
} }
} }
workqueue.ParallelizeUntil(context.TODO(), 16, len(allNodeNames), processNode) workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(allNodeNames), processNode)
return topologyMaps, firstError return topologyMaps, firstError
} }
@ -503,7 +504,7 @@ func getTPMapMatchingIncomingAffinityAntiAffinity(pod *v1.Pod, nodeInfoMap map[s
appendResult(node.Name, nodeTopologyPairsAffinityPodsMaps, nodeTopologyPairsAntiAffinityPodsMaps) appendResult(node.Name, nodeTopologyPairsAffinityPodsMaps, nodeTopologyPairsAntiAffinityPodsMaps)
} }
} }
workqueue.ParallelizeUntil(context.TODO(), 16, len(allNodeNames), processNode) workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(allNodeNames), processNode)
return topologyPairsAffinityPodsMaps, topologyPairsAntiAffinityPodsMaps, firstError return topologyPairsAffinityPodsMaps, topologyPairsAntiAffinityPodsMaps, firstError
} }

3
pkg/scheduler/algorithm/priorities/interpod_affinity.go
View File

@ -18,6 +18,7 @@ package priorities
import ( import (
"context" "context"
"runtime"
"sync" "sync"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
@ -211,7 +212,7 @@ func (ipa *InterPodAffinity) CalculateInterPodAffinityPriority(pod *v1.Pod, node
} }
} }
} }
workqueue.ParallelizeUntil(context.TODO(), 16, len(allNodeNames), processNode) workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(allNodeNames), processNode)
if pm.firstError != nil { if pm.firstError != nil {
return nil, pm.firstError return nil, pm.firstError
} }

7
pkg/scheduler/core/generic_scheduler.go
View File

@ -20,6 +20,7 @@ import (
"context" "context"
"fmt" "fmt"
"math" "math"
"runtime"
"sort" "sort"
"strings" "strings"
"sync" "sync"
@ -487,7 +488,7 @@ func (g *genericScheduler) findNodesThatFit(pod *v1.Pod, nodes []*v1.Node) ([]*v
// Stops searching for more nodes once the configured number of feasible nodes // Stops searching for more nodes once the configured number of feasible nodes
// are found. // are found.
workqueue.ParallelizeUntil(ctx, 16, int(allNodes), checkNode) workqueue.ParallelizeUntil(ctx, runtime.NumCPU(), int(allNodes), checkNode)
filtered = filtered[:filteredLen] filtered = filtered[:filteredLen]
if len(errs) > 0 { if len(errs) > 0 {
@ -693,7 +694,7 @@ func PrioritizeNodes(
} }
} }
workqueue.ParallelizeUntil(context.TODO(), 16, len(nodes), func(index int) { workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(nodes), func(index int) {
nodeInfo := nodeNameToInfo[nodes[index].Name] nodeInfo := nodeNameToInfo[nodes[index].Name]
for i := range priorityConfigs { for i := range priorityConfigs {
if priorityConfigs[i].Function != nil { if priorityConfigs[i].Function != nil {
@ -941,7 +942,7 @@ func selectNodesForPreemption(pod *v1.Pod,
resultLock.Unlock() resultLock.Unlock()
} }
} }
workqueue.ParallelizeUntil(context.TODO(), 16, len(potentialNodes), checkNode) workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(potentialNodes), checkNode)
return nodeToVictims, nil return nodeToVictims, nil
} }