github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flaky test] fix devicemanager TestDevicePluginReRegistrationProbeMode fail

Browse Source
This commit is contained in:
jornshen
2020-12-10 16:20:14 +08:00
parent 98bc258bf5
commit 93606f8ba3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/cm/devicemanager/manager_test.go
View File

@@ -282,8 +282,8 @@ func setup(t *testing.T, devs []*pluginapi.Device, callback monitorCallback, soc
func setupInProbeMode(t *testing.T, devs []*pluginapi.Device, callback monitorCallback, socketName string, pluginSocketName string) (Manager, <-chan interface{}, *Stub, pluginmanager.PluginManager) { func setupInProbeMode(t *testing.T, devs []*pluginapi.Device, callback monitorCallback, socketName string, pluginSocketName string) (Manager, <-chan interface{}, *Stub, pluginmanager.PluginManager) {
m, updateChan := setupDeviceManager(t, devs, callback, socketName) m, updateChan := setupDeviceManager(t, devs, callback, socketName)
pm := setupPluginManager(t, pluginSocketName, m)
p := setupDevicePlugin(t, devs, pluginSocketName) p := setupDevicePlugin(t, devs, pluginSocketName)
pm := setupPluginManager(t, pluginSocketName, m)
return m, updateChan, p, pm return m, updateChan, p, pm
} }

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

@@ -100,7 +100,11 @@ func (rc *reconciler) getHandlers() map[string]cache.PluginHandler {
rc.RLock() rc.RLock()
defer rc.RUnlock() defer rc.RUnlock()
return rc.handlers var copyHandlers = make(map[string]cache.PluginHandler)
for pluginType, handler := range rc.handlers {
copyHandlers[pluginType] = handler
}
return copyHandlers
} }
func (rc *reconciler) reconcile() { func (rc *reconciler) reconcile() {