From 93606f8ba3f6c83fad5a4d56562e80d0c41e919b Mon Sep 17 00:00:00 2001 From: jornshen Date: Thu, 10 Dec 2020 16:20:14 +0800 Subject: [PATCH] [flaky test] fix devicemanager TestDevicePluginReRegistrationProbeMode fail --- pkg/kubelet/cm/devicemanager/manager_test.go | 2 +- pkg/kubelet/pluginmanager/reconciler/reconciler.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/cm/devicemanager/manager_test.go b/pkg/kubelet/cm/devicemanager/manager_test.go index 9034498c66f..5c8c320223e 100644 --- a/pkg/kubelet/cm/devicemanager/manager_test.go +++ b/pkg/kubelet/cm/devicemanager/manager_test.go @@ -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) { m, updateChan := setupDeviceManager(t, devs, callback, socketName) - pm := setupPluginManager(t, pluginSocketName, m) p := setupDevicePlugin(t, devs, pluginSocketName) + pm := setupPluginManager(t, pluginSocketName, m) return m, updateChan, p, pm } diff --git a/pkg/kubelet/pluginmanager/reconciler/reconciler.go b/pkg/kubelet/pluginmanager/reconciler/reconciler.go index 2f12da55065..6cba0045469 100644 --- a/pkg/kubelet/pluginmanager/reconciler/reconciler.go +++ b/pkg/kubelet/pluginmanager/reconciler/reconciler.go @@ -100,7 +100,11 @@ func (rc *reconciler) getHandlers() map[string]cache.PluginHandler { rc.RLock() 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() {