From 253797acab860e4028eb8a316ff29a0243dca9b9 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Thu, 5 Sep 2019 09:38:52 +0800 Subject: [PATCH] Avoid conflicting log message when AddPodToVolume encounters error --- .../populator/desired_state_of_world_populator.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go index 31c5de4e8ae..d4f5204839c 100644 --- a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go +++ b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go @@ -298,6 +298,7 @@ func (dswp *desiredStateOfWorldPopulator) processPodVolumes( allVolumesAdded := true mountsMap, devicesMap := dswp.makeVolumeMap(pod.Spec.Containers) + expandInUsePV := utilfeature.DefaultFeatureGate.Enabled(features.ExpandInUsePersistentVolumes) // Process volume spec for each volume defined in pod for _, podVolume := range pod.Spec.Volumes { pvc, volumeSpec, volumeGidValue, err := @@ -325,15 +326,15 @@ func (dswp *desiredStateOfWorldPopulator) processPodVolumes( err) dswp.desiredStateOfWorld.AddErrorToPod(uniquePodName, err.Error()) allVolumesAdded = false + } else { + klog.V(4).Infof( + "Added volume %q (volSpec=%q) for pod %q to desired state.", + podVolume.Name, + volumeSpec.Name(), + uniquePodName) } - klog.V(4).Infof( - "Added volume %q (volSpec=%q) for pod %q to desired state.", - podVolume.Name, - volumeSpec.Name(), - uniquePodName) - - if utilfeature.DefaultFeatureGate.Enabled(features.ExpandInUsePersistentVolumes) { + if expandInUsePV { dswp.checkVolumeFSResize(pod, podVolume, pvc, volumeSpec, uniquePodName, mountedVolumesForPod, processedVolumesForFSResize) }