Merge pull request #378 from Rakshith-R/BZ-mirror-check

BUG 2311885: rbd: fail DisableVolumeReplication() if image is not mirror disabled
red-hat-storage · Sep 13, 2024 · 79eb51d · 79eb51d
2 parents ffd92a4 + 431f1c3
commit 79eb51d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/internal/rbd/replication.go b/internal/rbd/replication.go
@@ -89,8 +89,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