-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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
jewel: rbd-mirror: admin socket commands to start/stop/restart mirroring #9010
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
self-assigned this
May 10, 2016
ghost
pushed a commit
that referenced
this pull request
May 10, 2016
… start/stop/restart mirroring Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost
changed the title
jewel: rbd-mirror: admin socket commands to start/stop/restart mirroring
DNM: jewel: rbd-mirror: admin socket commands to start/stop/restart mirroring
May 10, 2016
CXX tools/rbd_mirror/image_replayer/OpenLocalImageRequest.lo tools/rbd_mirror/ImageReplayer.cc: In member function 'void rbd::mirror::ImageReplayer::update_mirror_image_status(bool, rbd::mirror::ImageReplayer::State)': tools/rbd_mirror/ImageReplayer.cc:1064:3: error: 'MirrorImageStatus' is not a member of 'cls::rbd' cls::rbd::MirrorImageStatus status; ^ |
@dachary Thx -- it applies cleanly when combined w/ the other PRs. I can rebase this one to pull in the missing cherry-pick from another PR for this one to build via GitHub (although not sure why GitHub doesn't have build status). |
Daemon name is only useful to differentiate asok and pid filenames, so just inline its use there. Everywhere else replace the 'daemon' parameter with cluster or local_cluster as appropriate. Remove the CLUSTER{1,2}_DAEMON vars as well, since they are no longer used. Signed-off-by: Josh Durgin <jdurgin@redhat.com> (cherry picked from commit 5fe64fa)
With these set, this script can work in teuthology, where we want to control the how daemons run and their log locations, valgrind settings, etc. The workunit task always sets CEPH_ID, and allows other env vars to be configured optionally. The RBD_MIRROR_USE_EXISTING_CLUSTER option can also speed up local testing. Signed-off-by: Josh Durgin <jdurgin@redhat.com> (cherry picked from commit dcd11a1)
Initially the asok commands were registered only after the image replayer start (and unregistered on stop) because their names were built using remote pool and image names, which became known only after start. Now, the asok commands are registered on the image replayer construction using the temporary name "remote_pool_name/global_image_id". They are re-registered using "remote_pool_name/remote_image_name" when the image replayer is started. Also the commands are not unregistered on the image replayer stop. Signed-off-by: Mykola Golub <mgolub@mirantis.com> (cherry picked from commit 2179048)
Signed-off-by: Mykola Golub <mgolub@mirantis.com> (cherry picked from commit 4c28fc2)
Signed-off-by: Mykola Golub <mgolub@mirantis.com> (cherry picked from commit a22cf51)
dillaman
changed the title
DNM: jewel: rbd-mirror: admin socket commands to start/stop/restart mirroring
jewel: rbd-mirror: admin socket commands to start/stop/restart mirroring
May 10, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
http://tracker.ceph.com/issues/15736