github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 04:27:54 +00:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
cvvz 2023-08-25 19:55:56 +08:00
parent e40d00cf53
commit ab1f97bd6e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubelet/volumemanager/reconciler/reconstruct.go
View File

@ -78,10 +78,6 @@ func (rc *reconciler) syncStates(kubeletPodDir string) {
devicePath: reconstructedVolume.devicePath, devicePath: reconstructedVolume.devicePath,
deviceMounter: reconstructedVolume.deviceMounter, deviceMounter: reconstructedVolume.deviceMounter,
blockVolumeMapper: reconstructedVolume.blockVolumeMapper, blockVolumeMapper: reconstructedVolume.blockVolumeMapper,
mounter: reconstructedVolume.mounter,
}
if cachedInfo, ok := volumesNeedUpdate[reconstructedVolume.volumeName]; ok {
gvl = cachedInfo
} }
if volumeInDSW { if volumeInDSW {
// Some pod needs the volume. And it exists on disk. Some previous // Some pod needs the volume. And it exists on disk. Some previous
@ -90,16 +86,23 @@ func (rc *reconciler) syncStates(kubeletPodDir string) {
// this new kubelet so reconcile() calls SetUp and re-mounts the // this new kubelet so reconcile() calls SetUp and re-mounts the
// volume if it's necessary. // volume if it's necessary.
volumeNeedReport = append(volumeNeedReport, reconstructedVolume.volumeName) volumeNeedReport = append(volumeNeedReport, reconstructedVolume.volumeName)
if cachedInfo, ok := rc.skippedDuringReconstruction[reconstructedVolume.volumeName]; ok {
gvl = cachedInfo
}
gvl.addPodVolume(reconstructedVolume)
rc.skippedDuringReconstruction[reconstructedVolume.volumeName] = gvl rc.skippedDuringReconstruction[reconstructedVolume.volumeName] = gvl
klog.V(4).InfoS("Volume exists in desired state, marking as InUse", "podName", volume.podName, "volumeSpecName", volume.volumeSpecName) klog.V(4).InfoS("Volume exists in desired state, marking as InUse", "podName", volume.podName, "volumeSpecName", volume.volumeSpecName)
continue continue
} }
gvl.addPodVolume(reconstructedVolume)
// There is no pod that uses the volume. // There is no pod that uses the volume.
if rc.operationExecutor.IsOperationPending(reconstructedVolume.volumeName, nestedpendingoperations.EmptyUniquePodName, nestedpendingoperations.EmptyNodeName) { if rc.operationExecutor.IsOperationPending(reconstructedVolume.volumeName, nestedpendingoperations.EmptyUniquePodName, nestedpendingoperations.EmptyNodeName) {
klog.InfoS("Volume is in pending operation, skip cleaning up mounts") klog.InfoS("Volume is in pending operation, skip cleaning up mounts")
} }
klog.V(2).InfoS("Reconciler sync states: could not find pod information in desired state, update it in actual state", "reconstructedVolume", reconstructedVolume) klog.V(2).InfoS("Reconciler sync states: could not find pod information in desired state, update it in actual state", "reconstructedVolume", reconstructedVolume)
if cachedInfo, ok := volumesNeedUpdate[reconstructedVolume.volumeName]; ok {
gvl = cachedInfo
}
gvl.addPodVolume(reconstructedVolume)
volumesNeedUpdate[reconstructedVolume.volumeName] = gvl volumesNeedUpdate[reconstructedVolume.volumeName] = gvl
} }