Skip to content
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: gracefully handle being blacklisted #9970

Merged
merged 4 commits into from Jul 6, 2016

Conversation

dillaman
Copy link

No description provided.

@trociny
Copy link
Contributor

trociny commented Jun 29, 2016

@dillaman could you please rebase when you have spare time

@dillaman
Copy link
Author

@trociny rebase pushed

trociny pushed a commit that referenced this pull request Jun 29, 2016
 [DNM] rbd-mirror: gracefully handle being blacklisted #9970
@@ -311,7 +356,7 @@ int Replayer::init()
// librados::Rados::conf_parse_argv
r = cct->_conf->parse_argv(m_args);
Copy link
Contributor

@trociny trociny Jun 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dillaman Need to pass a copy of m_args, because parse_argv removes parsed items from the vector. You can see this running rbd_mirror.sh and observing that log and asok file names are not properly set for the remote context.

@trociny
Copy link
Contributor

trociny commented Jun 30, 2016

@dillaman compilation of test/rbd_mirror/image_replay.cc fails. See jenkins logs.

@dillaman
Copy link
Author

@trociny updates pushed

trociny pushed a commit that referenced this pull request Jun 30, 2016
 [DNM] rbd-mirror: gracefully handle being blacklisted #9970
@trociny
Copy link
Contributor

trociny commented Jul 2, 2016

@dillaman please rebase

trociny pushed a commit that referenced this pull request Jul 3, 2016
 [DNM] rbd-mirror: gracefully handle being blacklisted #9970

Conflicts:
	src/test/rbd_mirror/image_replay.cc
trociny pushed a commit that referenced this pull request Jul 6, 2016
[DNM] rbd-mirror: gracefully handle being blacklisted #9970

Conflicts:
	src/test/rbd_mirror/image_replay.cc
Jason Dillaman added 4 commits July 6, 2016 11:36
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
@dillaman dillaman changed the title [DNM] rbd-mirror: gracefully handle being blacklisted rbd-mirror: gracefully handle being blacklisted Jul 6, 2016
@dillaman
Copy link
Author

dillaman commented Jul 6, 2016

@trociny rebased and pushed

@trociny
Copy link
Contributor

trociny commented Jul 6, 2016

lgtm

@trociny trociny merged commit 25ef9fd into ceph:master Jul 6, 2016
@dillaman dillaman deleted the wip-16349 branch July 6, 2016 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants