Merge pull request kubernetes#73934 from bsalamat/num_cpu

k8s-ci-robot · web-flow · commit cfe4ca801215 · 2019-03-01T23:04:17.000-08:00
Use runtime.NumCPU() instead of a fixed value for parallel scheduler threads
diff --git a/pkg/scheduler/algorithm/predicates/metadata.go b/pkg/scheduler/algorithm/predicates/metadata.go
@@ -19,6 +19,7 @@ package predicates
 import (
 	"context"
 	"fmt"
+	"runtime"
 	"sync"
 
 	"k8s.io/klog"
@@ -415,7 +416,7 @@ func getTPMapMatchingExistingAntiAffinity(pod *v1.Pod, nodeInfoMap map[string]*s
 			appendTopologyPairsMaps(existingPodTopologyMaps)
 		}
 	}
-	workqueue.ParallelizeUntil(context.TODO(), 16, len(allNodeNames), processNode)
+	workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(allNodeNames), processNode)
 	return topologyMaps, firstError
 }
 
@@ -503,7 +504,7 @@ func getTPMapMatchingIncomingAffinityAntiAffinity(pod *v1.Pod, nodeInfoMap map[s
 			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
 }
 
diff --git a/pkg/scheduler/algorithm/priorities/interpod_affinity.go b/pkg/scheduler/algorithm/priorities/interpod_affinity.go
@@ -18,6 +18,7 @@ package priorities
 
 import (
 	"context"
+	"runtime"
 	"sync"
 
 	"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 {
 		return nil, pm.firstError
 	}
diff --git a/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"math"
+	"runtime"
 	"sort"
 	"strings"
 	"sync"
@@ -489,7 +490,7 @@ func (g *genericScheduler) findNodesThatFit(pod *v1.Pod, nodes []*v1.Node) ([]*v
 
 		// Stops searching for more nodes once the configured number of feasible nodes
 		// are found.
-		workqueue.ParallelizeUntil(ctx, 16, int(allNodes), checkNode)
+		workqueue.ParallelizeUntil(ctx, runtime.NumCPU(), int(allNodes), checkNode)
 
 		filtered = filtered[:filteredLen]
 		if len(errs) > 0 {
@@ -695,7 +696,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]
 		for i := range priorityConfigs {
 			if priorityConfigs[i].Function != nil {
@@ -943,7 +944,7 @@ func selectNodesForPreemption(pod *v1.Pod,
 			resultLock.Unlock()
 		}
 	}
-	workqueue.ParallelizeUntil(context.TODO(), 16, len(potentialNodes), checkNode)
+	workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(potentialNodes), checkNode)
 	return nodeToVictims, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ package predicates`
`19`	`19`	`import (`
`20`	`20`	`"context"`
`21`	`21`	`"fmt"`
	`22`	`+ "runtime"`
`22`	`23`	`"sync"`
`23`	`24`
`24`	`25`	`"k8s.io/klog"`
`@@ -415,7 +416,7 @@ func getTPMapMatchingExistingAntiAffinity(pod v1.Pod, nodeInfoMap map[string]s`
`415`	`416`	`appendTopologyPairsMaps(existingPodTopologyMaps)`
`416`	`417`	`}`
`417`	`418`	`}`
`418`		`- workqueue.ParallelizeUntil(context.TODO(), 16, len(allNodeNames), processNode)`
	`419`	`+ workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(allNodeNames), processNode)`
`419`	`420`	`return topologyMaps, firstError`
`420`	`421`	`}`
`421`	`422`
`@@ -503,7 +504,7 @@ func getTPMapMatchingIncomingAffinityAntiAffinity(pod *v1.Pod, nodeInfoMap map[s`
`503`	`504`	`appendResult(node.Name, nodeTopologyPairsAffinityPodsMaps, nodeTopologyPairsAntiAffinityPodsMaps)`
`504`	`505`	`}`
`505`	`506`	`}`
`506`		`- workqueue.ParallelizeUntil(context.TODO(), 16, len(allNodeNames), processNode)`
	`507`	`+ workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(allNodeNames), processNode)`
`507`	`508`	`return topologyPairsAffinityPodsMaps, topologyPairsAntiAffinityPodsMaps, firstError`
`508`	`509`	`}`
`509`	`510`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package priorities`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"context"`
	`21`	`+ "runtime"`
`21`	`22`	`"sync"`
`22`	`23`
`23`	`24`	`"k8s.io/api/core/v1"`
`@@ -211,7 +212,7 @@ func (ipa InterPodAffinity) CalculateInterPodAffinityPriority(pod v1.Pod, node`
`211`	`212`	`}`
`212`	`213`	`}`
`213`	`214`	`}`
`214`		`- workqueue.ParallelizeUntil(context.TODO(), 16, len(allNodeNames), processNode)`
	`215`	`+ workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(allNodeNames), processNode)`
`215`	`216`	`if pm.firstError != nil {`
`216`	`217`	`return nil, pm.firstError`
`217`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"context"`
`21`	`21`	`"fmt"`
`22`	`22`	`"math"`
	`23`	`+ "runtime"`
`23`	`24`	`"sort"`
`24`	`25`	`"strings"`
`25`	`26`	`"sync"`
`@@ -489,7 +490,7 @@ func (g genericScheduler) findNodesThatFit(pod v1.Pod, nodes []v1.Node) ([]v`
`489`	`490`
`490`	`491`	`// Stops searching for more nodes once the configured number of feasible nodes`
`491`	`492`	`// are found.`
`492`		`- workqueue.ParallelizeUntil(ctx, 16, int(allNodes), checkNode)`
	`493`	`+ workqueue.ParallelizeUntil(ctx, runtime.NumCPU(), int(allNodes), checkNode)`
`493`	`494`
`494`	`495`	`filtered = filtered[:filteredLen]`
`495`	`496`	`if len(errs) > 0 {`
`@@ -695,7 +696,7 @@ func PrioritizeNodes(`
`695`	`696`	`}`
`696`	`697`	`}`
`697`	`698`
`698`		`- workqueue.ParallelizeUntil(context.TODO(), 16, len(nodes), func(index int) {`
	`699`	`+ workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(nodes), func(index int) {`
`699`	`700`	`nodeInfo := nodeNameToInfo[nodes[index].Name]`
`700`	`701`	`for i := range priorityConfigs {`
`701`	`702`	`if priorityConfigs[i].Function != nil {`
`@@ -943,7 +944,7 @@ func selectNodesForPreemption(pod *v1.Pod,`
`943`	`944`	`resultLock.Unlock()`
`944`	`945`	`}`
`945`	`946`	`}`
`946`		`- workqueue.ParallelizeUntil(context.TODO(), 16, len(potentialNodes), checkNode)`
	`947`	`+ workqueue.ParallelizeUntil(context.TODO(), runtime.NumCPU(), len(potentialNodes), checkNode)`
`947`	`948`	`return nodeToVictims, nil`
`948`	`949`	`}`
`949`	`950`