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

Merge pull request #101510 from huchengze/patch-12

Browse Source 
migrate log in pkg/volume/plugins.go
This commit is contained in:
Kubernetes Prow Robot
2021-05-20 21:14:57 -07:00
committed by GitHub
parent e5124ead9a 45ec665142
commit f803daaca7
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/volume/plugins.go
View File

@@ -608,7 +608,7 @@ func (pm *VolumePluginMgr) InitPlugins(plugins []VolumePlugin, prober DynamicPlu
} }
if err := pm.prober.Init(); err != nil { if err := pm.prober.Init(); err != nil {
// Prober init failure should not affect the initialization of other plugins. // Prober init failure should not affect the initialization of other plugins.
klog.Errorf("Error initializing dynamic plugin prober: %s", err) klog.ErrorS(err, "Error initializing dynamic plugin prober")
pm.prober = &dummyPluginProber{} pm.prober = &dummyPluginProber{}
} }
@@ -633,12 +633,12 @@ func (pm *VolumePluginMgr) InitPlugins(plugins []VolumePlugin, prober DynamicPlu
} }
err := plugin.Init(host) err := plugin.Init(host)
if err != nil { if err != nil {
klog.Errorf("Failed to load volume plugin %s, error: %s", name, err.Error()) klog.ErrorS(err, "Failed to load volume plugin", "pluginName", name)
allErrs = append(allErrs, err) allErrs = append(allErrs, err)
continue continue
} }
pm.plugins[name] = plugin pm.plugins[name] = plugin
klog.V(1).Infof("Loaded volume plugin %q", name) klog.V(1).InfoS("Loaded volume plugin", "pluginName", name)
} }
return utilerrors.NewAggregate(allErrs) return utilerrors.NewAggregate(allErrs)
} }
@@ -654,7 +654,7 @@ func (pm *VolumePluginMgr) initProbedPlugin(probedPlugin VolumePlugin) error {
return fmt.Errorf("failed to load volume plugin %s, error: %s", name, err.Error()) return fmt.Errorf("failed to load volume plugin %s, error: %s", name, err.Error())
} }
klog.V(1).Infof("Loaded volume plugin %q", name) klog.V(1).InfoS("Loaded volume plugin", "pluginName", name)
return nil return nil
} }
@@ -747,15 +747,15 @@ func (pm *VolumePluginMgr) logDeprecation(plugin string) {
func (pm *VolumePluginMgr) refreshProbedPlugins() { func (pm *VolumePluginMgr) refreshProbedPlugins() {
events, err := pm.prober.Probe() events, err := pm.prober.Probe()
if err != nil { if err != nil {
klog.Errorf("Error dynamically probing plugins: %s", err) klog.ErrorS(err, "Error dynamically probing plugins")
return // Use cached plugins upon failure. return // Use cached plugins upon failure.
} }
for _, event := range events { for _, event := range events {
if event.Op == ProbeAddOrUpdate { if event.Op == ProbeAddOrUpdate {
if err := pm.initProbedPlugin(event.Plugin); err != nil { if err := pm.initProbedPlugin(event.Plugin); err != nil {
klog.Errorf("Error initializing dynamically probed plugin %s; error: %s", klog.ErrorS(err, "Error initializing dynamically probed plugin",
event.Plugin.GetPluginName(), err) "pluginName", event.Plugin.GetPluginName())
continue continue
} }
pm.probedPlugins[event.Plugin.GetPluginName()] = event.Plugin pm.probedPlugins[event.Plugin.GetPluginName()] = event.Plugin
@@ -763,8 +763,8 @@ func (pm *VolumePluginMgr) refreshProbedPlugins() {
// Plugin is not available on ProbeRemove event, only PluginName // Plugin is not available on ProbeRemove event, only PluginName
delete(pm.probedPlugins, event.PluginName) delete(pm.probedPlugins, event.PluginName)
} else { } else {
klog.Errorf("Unknown Operation on PluginName: %s.", klog.ErrorS(nil, "Unknown Operation on PluginName.",
event.Plugin.GetPluginName()) "pluginName", event.Plugin.GetPluginName())
} }
} }
} }
@@ -958,10 +958,10 @@ func (pm *VolumePluginMgr) FindExpandablePluginBySpec(spec *Spec) (ExpandableVol
if spec.IsKubeletExpandable() { if spec.IsKubeletExpandable() {
// for kubelet expandable volumes, return a noop plugin that // for kubelet expandable volumes, return a noop plugin that
// returns success for expand on the controller // returns success for expand on the controller
klog.V(4).Infof("FindExpandablePluginBySpec(%s) -> returning noopExpandableVolumePluginInstance", spec.Name()) klog.V(4).InfoS("FindExpandablePluginBySpec -> returning noopExpandableVolumePluginInstance", "specName", spec.Name())
return &noopExpandableVolumePluginInstance{spec}, nil return &noopExpandableVolumePluginInstance{spec}, nil
} }
klog.V(4).Infof("FindExpandablePluginBySpec(%s) -> err:%v", spec.Name(), err) klog.V(4).InfoS("FindExpandablePluginBySpec -> err", "specName", spec.Name(), "err", err)
return nil, err return nil, err
} }