rbd: the DeleteVolume CSI procedure should succeed on deleted images

If the RBD-image is deleted already, the DeleteVolume CSI procedure is expected to report success (as it should be idempotent). In case the returned error indicates "RBD image not found", the error is ignored and the DeleteVolume procedure continues. Signed-off-by: Niels de Vos <[email protected]>
ceph · Nov 27, 2023 · d0231ca · d0231ca
1 parent 373c670
commit d0231ca
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go
@@ -1017,9 +1017,10 @@ func cleanupRBDImage(ctx context.Context,
 		}
 	}
 
-	// Deleting rbd image
+	// Deleting rbd image, it isn't a failure if the image was deleted already.
 	log.DebugLog(ctx, "deleting image %s", rbdVol.RbdImageName)
-	if err = rbdVol.deleteImage(ctx); err != nil {
+	err = rbdVol.deleteImage(ctx)
+	if err != nil && !errors.Is(err, librbd.ErrNotFound) {
 		log.ErrorLog(ctx, "failed to delete rbd image: %s with error: %v",
 			rbdVol, err)