New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rbd-mirror: image deletions should be handled by assigned instance #14832

Merged
merged 6 commits into from Apr 28, 2017

Conversation

Projects
None yet
2 participants
@dillaman
Contributor

dillaman commented Apr 27, 2017

No description provided.

@trociny trociny self-assigned this Apr 27, 2017

@@ -175,9 +175,6 @@ class BootstrapRequest : public BaseRequest {
bufferlist m_out_bl;
void get_local_image_id();
void handle_get_local_image_id(int r);

This comment has been minimized.

@trociny

trociny Apr 27, 2017

Contributor

need to update the state diagram

This comment has been minimized.

@dillaman

dillaman Apr 27, 2017

Contributor

ack

dillaman added some commits Apr 25, 2017

rbd-mirror: pass pool watcher image ids by rvalue
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
rbd-mirror: deletions should be scheduled using global ids
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
rbd-mirror: forward initial pool image deletions to instance
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
librbd: remove duplicative journal helper functions
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
rbd-mirror: new state machine for preparing local image
This state machine will be invoked before the bootstrap state machine
and will be responsible for detecting if the local image is already
primary or if it needs to be deleted.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
rbd-mirror: provide image status updates without remotes
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
@@ -335,7 +336,8 @@ void ImageReplayer<I>::add_remote_image(const std::string &mirror_uuid,
template <typename I>
void ImageReplayer<I>::remove_remote_image(const std::string &mirror_uuid,
const std::string &image_id) {
const std::string &image_id,
bool schedule_delete) {

This comment has been minimized.

@trociny

trociny Apr 27, 2017

Contributor

nit: you might want to use spaces vs tabs here

@@ -109,7 +109,8 @@ class ImageReplayer {
const std::string &remote_image_id,
librados::IoCtx &remote_io_ctx);
void remove_remote_image(const std::string &remote_mirror_uuid,
const std::string &remote_image_id);
const std::string &remote_image_id,
bool schedule_delete);

This comment has been minimized.

@trociny

trociny Apr 27, 2017

Contributor

tabs vs spaces

image_replayer->remove_remote_image(peer_mirror_uuid, peer_image_id);
if (!peer_mirror_uuid.empty()) {
image_replayer->remove_remote_image(peer_mirror_uuid, peer_image_id,
schedule_delete);

This comment has been minimized.

@trociny

trociny Apr 27, 2017

Contributor

tabs

@trociny

lgtm

@trociny trociny merged commit 6258e4c into ceph:master Apr 28, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@dillaman dillaman deleted the dillaman:wip-rbd-mirror-deletion branch Apr 28, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment