From 407b9d961048cd9b26a6d741187c3258f63d4fae Mon Sep 17 00:00:00 2001 From: carlory Date: Thu, 9 Nov 2023 15:38:49 +0800 Subject: [PATCH] remove duplicated check in operator_generator.go --- .../util/operationexecutor/operation_generator.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkg/volume/util/operationexecutor/operation_generator.go b/pkg/volume/util/operationexecutor/operation_generator.go index a8183572564..3d364653b7b 100644 --- a/pkg/volume/util/operationexecutor/operation_generator.go +++ b/pkg/volume/util/operationexecutor/operation_generator.go @@ -1558,14 +1558,6 @@ func (og *operationGenerator) GenerateVerifyControllerAttachedVolumeFunc( return volumetypes.NewOperationContext(eventErr, detailedErr, migrated) } - if node == nil { - // On failure, return error. Caller will log and retry. - eventErr, detailedErr := volumeToMount.GenerateError( - "VerifyControllerAttachedVolume failed", - fmt.Errorf("node object retrieved from API server is nil")) - return volumetypes.NewOperationContext(eventErr, detailedErr, migrated) - } - for _, attachedVolume := range node.Status.VolumesAttached { if attachedVolume.Name == volumeToMount.VolumeName { addVolumeNodeErr := actualStateOfWorld.MarkVolumeAsAttached( @@ -1609,13 +1601,6 @@ func (og *operationGenerator) verifyVolumeIsSafeToDetach( return volumeToDetach.GenerateErrorDetailed("DetachVolume failed fetching node from API server", fetchErr) } - if node == nil { - // On failure, return error. Caller will log and retry. - return volumeToDetach.GenerateErrorDetailed( - "DetachVolume failed fetching node from API server", - fmt.Errorf("node object retrieved from API server is nil")) - } - for _, inUseVolume := range node.Status.VolumesInUse { if inUseVolume == volumeToDetach.VolumeName { return volumeToDetach.GenerateErrorDetailed(