github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78592 from tedyu/plugin-mgr

Browse Source 
Use read lock for reconciler#getHandlers and clean up for the pluginmanager
This commit is contained in:
Kubernetes Prow Robot 2019-06-03 18:17:14 -07:00 committed by GitHub
commit e0ae55059d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/pluginmanager/cache/actual_state_of_world.go vendored
View File

@ -100,9 +100,7 @@ func (asw *actualStateOfWorld) RemovePlugin(socketPath string) {
asw.Lock() asw.Lock()
defer asw.Unlock() defer asw.Unlock()
if _, ok := asw.socketFileToInfo[socketPath]; ok { delete(asw.socketFileToInfo, socketPath)
delete(asw.socketFileToInfo, socketPath)
}
} }
func (asw *actualStateOfWorld) GetRegisteredPlugins() []PluginInfo { func (asw *actualStateOfWorld) GetRegisteredPlugins() []PluginInfo {

4
pkg/kubelet/pluginmanager/cache/desired_state_of_world.go vendored
View File

@ -147,9 +147,7 @@ func (dsw *desiredStateOfWorld) RemovePlugin(socketPath string) {
dsw.Lock() dsw.Lock()
defer dsw.Unlock() defer dsw.Unlock()
if _, ok := dsw.socketFileToInfo[socketPath]; ok { delete(dsw.socketFileToInfo, socketPath)
delete(dsw.socketFileToInfo, socketPath)
}
} }
func (dsw *desiredStateOfWorld) GetPluginsToRegister() []PluginInfo { func (dsw *desiredStateOfWorld) GetPluginsToRegister() []PluginInfo {

4
pkg/kubelet/pluginmanager/reconciler/reconciler.go
View File

@ -97,8 +97,8 @@ func (rc *reconciler) AddHandler(pluginType string, pluginHandler cache.PluginHa
} }
func (rc *reconciler) getHandlers() map[string]cache.PluginHandler { func (rc *reconciler) getHandlers() map[string]cache.PluginHandler {
rc.Lock() rc.RLock()
defer rc.Unlock() defer rc.RUnlock()
return rc.handlers return rc.handlers
} }