RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 00:22:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: use consistent "non-primary" verbiage for image mirroring

Browse Source 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2016-03-25 11:15:18 -04:00
parent 04892961d2
commit 4adc57ecfb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/cli/rbd/help.t
View File

@ -42,7 +42,8 @@
lock remove (lock rm) Release a lock on an image.
map Map image to a block device using the kernel.
merge-diff Merge two diff exports together.
mirror image demote Demote an image to secondary for RBD mirroring.
mirror image demote Demote an image to non-primary for RBD
mirroring.
mirror image disable Disable RBD mirroring for an image.
mirror image enable Enable RBD mirroring for an image.
mirror image promote Promote an image to primary for RBD mirroring.
@ -755,7 +756,7 @@
usage: rbd mirror image demote [--pool <pool>] [--image <image>]
<image-spec>
Demote an image to secondary for RBD mirroring.
Demote an image to non-primary for RBD mirroring.
Positional arguments
<image-spec> image specification

8
src/tools/rbd/action/MirrorImage.cc
View File

@ -121,7 +121,7 @@ int execute_promote(const po::variables_map &vm) {
return r;
}
std::cout << "" << std::endl;
std::cout << "Image promoted to primary" << std::endl;
return 0;
}
@ -148,11 +148,11 @@ int execute_demote(const po::variables_map &vm) {
r = image.mirror_image_demote();
if (r < 0) {
std::cerr << "rbd: error demoting image to secondary" << std::endl;
std::cerr << "rbd: error demoting image to non-primary" << std::endl;
return r;
}
std::cout << "Image demoted to secondary" << std::endl;
std::cout << "Image demoted to non-primary" << std::endl;
return 0;
}
@ -201,7 +201,7 @@ Shell::Action action_promote(
&get_arguments_promote, &execute_promote);
Shell::Action action_demote(
{"mirror", "image", "demote"}, {},
"Demote an image to secondary for RBD mirroring.", "",
"Demote an image to non-primary for RBD mirroring.", "",
&get_arguments, &execute_demote);
Shell::Action action_resync(
{"mirror", "image", "resync"}, {},