Merge pull request #379 from red-hat-storage/sync_ds--devel

Syncing latest changes from devel for ceph-csi
red-hat-storage · Sep 13, 2024 · 097435c · 097435c
2 parents 2bfa3e9 + 0fb963a
commit 097435c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/internal/rbd/replication.go b/internal/rbd/replication.go
@@ -90,8 +90,10 @@ func DisableVolumeReplication(mirror types.Mirror,
 		return fmt.Errorf("failed to get mirroring info of image: %w", err)
 	}
 
-	if info.GetState() == librbd.MirrorImageDisabling.String() {
-		return fmt.Errorf("%w: image is in disabling state", ErrAborted)
+	// error out if the image is not in disabled state.
+	if info.GetState() != librbd.MirrorImageDisabled.String() {
+		return fmt.Errorf("%w: image is in %q state, expected state %q", ErrAborted,
+			info.GetState(), librbd.MirrorImageDisabled.String())
 	}
 
 	return nil