mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #92692 from Pingan2017/verify-controller-attach
fix bug for verify attached volume loop
This commit is contained in:
commit
71fea80155
@ -704,6 +704,7 @@ func (oe *operationExecutor) VerifyVolumesAreAttached(
|
|||||||
volumeSpecMapByPlugin := make(map[string]map[*volume.Spec]v1.UniqueVolumeName)
|
volumeSpecMapByPlugin := make(map[string]map[*volume.Spec]v1.UniqueVolumeName)
|
||||||
|
|
||||||
for node, nodeAttachedVolumes := range attachedVolumes {
|
for node, nodeAttachedVolumes := range attachedVolumes {
|
||||||
|
needIndividualVerifyVolumes := []AttachedVolume{}
|
||||||
for _, volumeAttached := range nodeAttachedVolumes {
|
for _, volumeAttached := range nodeAttachedVolumes {
|
||||||
if volumeAttached.VolumeSpec == nil {
|
if volumeAttached.VolumeSpec == nil {
|
||||||
klog.Errorf("VerifyVolumesAreAttached: nil spec for volume %s", volumeAttached.VolumeName)
|
klog.Errorf("VerifyVolumesAreAttached: nil spec for volume %s", volumeAttached.VolumeName)
|
||||||
@ -757,12 +758,12 @@ func (oe *operationExecutor) VerifyVolumesAreAttached(
|
|||||||
volumeSpecMapByPlugin[pluginName] = volumeSpecMap
|
volumeSpecMapByPlugin[pluginName] = volumeSpecMap
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// If node doesn't support Bulk volume polling it is best to poll individually
|
// If node doesn't support Bulk volume polling it is best to poll individually
|
||||||
nodeError := oe.VerifyVolumesAreAttachedPerNode(nodeAttachedVolumes, node, actualStateOfWorld)
|
needIndividualVerifyVolumes = append(needIndividualVerifyVolumes, volumeAttached)
|
||||||
if nodeError != nil {
|
|
||||||
klog.Errorf("VerifyVolumesAreAttached failed for volumes %v, node %q with error %v", nodeAttachedVolumes, node, nodeError)
|
|
||||||
}
|
}
|
||||||
|
nodeError := oe.VerifyVolumesAreAttachedPerNode(needIndividualVerifyVolumes, node, actualStateOfWorld)
|
||||||
|
if nodeError != nil {
|
||||||
|
klog.Errorf("VerifyVolumesAreAttached failed for volumes %v, node %q with error %v", needIndividualVerifyVolumes, node, nodeError)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user