[manila-csi-plugin] ControllerExpandVolume: fix bad key for deleting from pendingVolumes (kubernetes#1667) (kubernetes#1675)

gman0 · m-k8s · web-flow · commit 4f6a9317ba7a · 2021-11-02T02:46:58.000-07:00
* [manila-csi-plugin] in ControllerExpandVolume fix bad key for pendingVolumes.Delete /closes kubernetes#1666 * [manila-csi-plugin] use share.Name to identify volumes in pendingVolumes.Delete Co-authored-by: Alexis Ries <42094254+alexisries@users.noreply.github.com>
diff --git a/pkg/csi/manila/controllerserver.go b/pkg/csi/manila/controllerserver.go
@@ -445,7 +445,7 @@ func (cs *controllerServer) ControllerExpandVolume(ctx context.Context, req *csi
 	}
 
 	// Check for pending operations on this volume
-	if _, isPending := pendingVolumes.LoadOrStore(req.GetVolumeId(), true); isPending {
+	if _, isPending := pendingVolumes.LoadOrStore(share.Name, true); isPending {
 		return nil, status.Errorf(codes.Aborted, "volume %s is already being processed", share.Name)
 	}
 	defer pendingVolumes.Delete(share.Name)

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ func (cs controllerServer) ControllerExpandVolume(ctx context.Context, req csi`
`445`	`445`	`}`
`446`	`446`
`447`	`447`	`// Check for pending operations on this volume`
`448`		`- if _, isPending := pendingVolumes.LoadOrStore(req.GetVolumeId(), true); isPending {`
	`448`	`+ if _, isPending := pendingVolumes.LoadOrStore(share.Name, true); isPending {`
`449`	`449`	`return nil, status.Errorf(codes.Aborted, "volume %s is already being processed", share.Name)`
`450`	`450`	`}`
`451`	`451`	`defer pendingVolumes.Delete(share.Name)`