Skip to content

K
k3s
Unverified Commit 98cf84ff authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #76256 from tedyu/master

Use RWMutex for accessing scheduler factory obj
parents d5dbc001 22d19be4
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
pkg/scheduler/factory/plugins.go
View file @ 98cf84ff
...@@ -245,8 +245,8 @@ func RegisterCustomFitPredicate(policy schedulerapi.PredicatePolicy) string { ...@@ -245,8 +245,8 @@ func RegisterCustomFitPredicate(policy schedulerapi.PredicatePolicy) string {
// IsFitPredicateRegistered is useful for testing providers. // IsFitPredicateRegistered is useful for testing providers.
func IsFitPredicateRegistered(name string) bool { func IsFitPredicateRegistered(name string) bool {
schedulerFactoryMutex.Lock() schedulerFactoryMutex.RLock()
defer schedulerFactoryMutex.Unlock() defer schedulerFactoryMutex.RUnlock()
_, ok := fitPredicateMap[name] _, ok := fitPredicateMap[name]
return ok return ok
} }
...@@ -408,8 +408,8 @@ func GetAlgorithmProvider(name string) (*AlgorithmProviderConfig, error) { ...@@ -408,8 +408,8 @@ func GetAlgorithmProvider(name string) (*AlgorithmProviderConfig, error) {
} }
func getFitPredicateFunctions(names sets.String, args PluginFactoryArgs) (map[string]predicates.FitPredicate, error) { func getFitPredicateFunctions(names sets.String, args PluginFactoryArgs) (map[string]predicates.FitPredicate, error) {
schedulerFactoryMutex.Lock() schedulerFactoryMutex.RLock()
defer schedulerFactoryMutex.Unlock() defer schedulerFactoryMutex.RUnlock()
fitPredicates := map[string]predicates.FitPredicate{} fitPredicates := map[string]predicates.FitPredicate{}
for _, name := range names.List() { for _, name := range names.List() {
...@@ -451,8 +451,8 @@ func getPredicateMetadataProducer(args PluginFactoryArgs) (predicates.PredicateM ...@@ -451,8 +451,8 @@ func getPredicateMetadataProducer(args PluginFactoryArgs) (predicates.PredicateM
} }
func getPriorityFunctionConfigs(names sets.String, args PluginFactoryArgs) ([]priorities.PriorityConfig, error) { func getPriorityFunctionConfigs(names sets.String, args PluginFactoryArgs) ([]priorities.PriorityConfig, error) {
schedulerFactoryMutex.Lock() schedulerFactoryMutex.RLock()
defer schedulerFactoryMutex.Unlock() defer schedulerFactoryMutex.RUnlock()
var configs []priorities.PriorityConfig var configs []priorities.PriorityConfig
for _, name := range names.List() { for _, name := range names.List() {
...@@ -538,8 +538,8 @@ func validatePriorityOrDie(priority schedulerapi.PriorityPolicy) { ...@@ -538,8 +538,8 @@ func validatePriorityOrDie(priority schedulerapi.PriorityPolicy) {
// ListRegisteredFitPredicates returns the registered fit predicates. // ListRegisteredFitPredicates returns the registered fit predicates.
func ListRegisteredFitPredicates() []string { func ListRegisteredFitPredicates() []string {
schedulerFactoryMutex.Lock() schedulerFactoryMutex.RLock()
defer schedulerFactoryMutex.Unlock() defer schedulerFactoryMutex.RUnlock()
var names []string var names []string
for name := range fitPredicateMap { for name := range fitPredicateMap {
...@@ -550,8 +550,8 @@ func ListRegisteredFitPredicates() []string { ...@@ -550,8 +550,8 @@ func ListRegisteredFitPredicates() []string {
// ListRegisteredPriorityFunctions returns the registered priority functions. // ListRegisteredPriorityFunctions returns the registered priority functions.
func ListRegisteredPriorityFunctions() []string { func ListRegisteredPriorityFunctions() []string {
schedulerFactoryMutex.Lock() schedulerFactoryMutex.RLock()
defer schedulerFactoryMutex.Unlock() defer schedulerFactoryMutex.RUnlock()
var names []string var names []string
for name := range priorityFunctionMap { for name := range priorityFunctionMap {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment