rbd-mirror: prevent enabling/disabling an image's mirroring when not in image mode #8332
Conversation
| @@ -183,7 +183,9 @@ namespace librbd { | |||
| int mirror_peer_set_cluster(IoCtx& io_ctx, const std::string &uuid, | |||
| const std::string &cluster_name); | |||
|
|
|||
| int mirror_image_enable_internal(ImageCtx *ictx); | |||
There was a problem hiding this comment.
Any reason to expose these outside of the file?
There was a problem hiding this comment.
Nope, no good reason. I'll move them to the "anonymous namespace" block
|
lgtm -- just the minor nitpick |
dillaman
changed the title
|
Fixed the commits and rebased on top of master. |
|
@dillaman it's just a minor conflict with the mirror_image_enable function. I was just trying to save you from the trouble of fixing conflicts, but I'm good either way. |
|
@rjfd The TestMirroring.* test cases are failing when I tested this locally.
|
…g mode Signed-off-by: Ricardo Dias <rdias@suse.com>
… mode Signed-off-by: Ricardo Dias <rdias@suse.com> Fixes: ceph#15267
…ew conditions to enable/disable image mirroring Signed-off-by: Ricardo Dias <rdias@suse.com>
|
@dillaman fixed the unit tests. |
Fixes: #15267
Ticket url: http://tracker.ceph.com/issues/15267