diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t index 502a6722bdc..44b0908f1e7 100644 --- a/src/test/cli/rbd/help.t +++ b/src/test/cli/rbd/help.t @@ -5,48 +5,53 @@ Positional arguments: - bench-write Simple write benchmark. - children Display children of snapshot. - clone Clone a snapshot into a COW child image. - copy (cp) Copy src image to dest. - create Create an empty image. - diff Print extents that differ since a previous snap, or - image creation. - disk-usage (du) Show disk usage stats for pool, image or snapshot - export Export image to file. - export-diff Export incremental diff to file. - feature disable Disable the specified image feature. - feature enable Enable the specified image feature. - flatten Fill clone with parent data (make it independent). - image-meta get Image metadata get the value associated with the key. - image-meta list Image metadata list keys with values. - image-meta remove Image metadata remove the key and value associated. - image-meta set Image metadata set key with value. - import Import image from file. - import-diff Import an incremental diff. - info Show information about image size, striping, etc. - list (ls) List rbd images. - lock add Take a lock on an image. - lock list Show locks held on an image. - 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. - object-map rebuild Rebuild an invalid object map. - remove (rm) Delete an image. - rename (mv) Rename image within pool. - resize Resize (expand or shrink) image. - showmapped Show the rbd images mapped by the kernel. - snap create Create a snapshot. - snap ls Dump list of image snapshots. - snap protect Prevent a snapshot from being deleted. - snap purge Deletes all snapshots. - snap remove (snap rm) Deletes a snapshot. - snap rename Rename a snapshot. - snap rollback Rollback image to snapshot. - snap unprotect Allow a snapshot to be deleted. - status Show the status of this image. - unmap Unmap a rbd device that was used by the kernel. - watch Watch events on image. + bench-write Simple write benchmark. + children Display children of snapshot. + clone Clone a snapshot into a COW child image. + copy (cp) Copy src image to dest. + create Create an empty image. + diff Print extents that differ since a previous + snap, or image creation. + disk-usage (du) Show disk usage stats for pool, image or + snapshot + export Export image to file. + export-diff Export incremental diff to file. + feature disable Disable the specified image feature. + feature enable Enable the specified image feature. + flatten Fill clone with parent data (make it + independent). + image-meta get Image metadata get the value associated with + the key. + image-meta list Image metadata list keys with values. + image-meta remove Image metadata remove the key and value + associated. + image-meta set Image metadata set key with value. + import Import image from file. + import-diff Import an incremental diff. + info Show information about image size, striping, + etc. + list (ls) List rbd images. + lock add Take a lock on an image. + lock list (lock ls) Show locks held on an image. + 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. + object-map rebuild Rebuild an invalid object map. + remove (rm) Delete an image. + rename (mv) Rename image within pool. + resize Resize (expand or shrink) image. + showmapped Show the rbd images mapped by the kernel. + snap create (snap add) Create a snapshot. + snap list (snap ls) Dump list of image snapshots. + snap protect Prevent a snapshot from being deleted. + snap purge Deletes all snapshots. + snap remove (snap rm) Deletes a snapshot. + snap rename Rename a snapshot. + snap rollback (snap revert) Rollback image to snapshot. + snap unprotect Allow a snapshot to be deleted. + status Show the status of this image. + unmap Unmap a rbd device that was used by the kernel. + watch Watch events on image. Optional arguments: -c [ --conf ] arg path to cluster configuration @@ -645,10 +650,10 @@ --image arg image name --snap arg snapshot name - rbd help snap ls - usage: rbd snap ls [--pool ] [--image ] [--format ] - [--pretty-format] - + rbd help snap list + usage: rbd snap list [--pool ] [--image ] [--format ] + [--pretty-format] + Dump list of image snapshots. diff --git a/src/tools/rbd/action/Lock.cc b/src/tools/rbd/action/Lock.cc index 2b5eb29ea23..c39a4c5ff82 100644 --- a/src/tools/rbd/action/Lock.cc +++ b/src/tools/rbd/action/Lock.cc @@ -252,7 +252,7 @@ int execute_remove(const po::variables_map &vm) { } Shell::Action action_list( - {"lock", "list"}, {}, "Show locks held on an image.", "", + {"lock", "list"}, {"lock", "ls"}, "Show locks held on an image.", "", &get_list_arguments, &execute_list); Shell::Action action_add( {"lock", "add"}, {}, "Take a lock on an image.", "", diff --git a/src/tools/rbd/action/Snap.cc b/src/tools/rbd/action/Snap.cc index bc78ca64287..e20e87887a2 100644 --- a/src/tools/rbd/action/Snap.cc +++ b/src/tools/rbd/action/Snap.cc @@ -466,10 +466,10 @@ int execute_rename(const po::variables_map &vm) { } Shell::Action action_list( - {"snap", "ls"}, {}, "Dump list of image snapshots.", "", + {"snap", "list"}, {"snap", "ls"}, "Dump list of image snapshots.", "", &get_list_arguments, &execute_list); Shell::Action action_create( - {"snap", "create"}, {}, "Create a snapshot.", "", + {"snap", "create"}, {"snap", "add"}, "Create a snapshot.", "", &get_create_arguments, &execute_create); Shell::Action action_remove( {"snap", "remove"}, {"snap", "rm"}, "Deletes a snapshot.", "", @@ -478,7 +478,7 @@ Shell::Action action_purge( {"snap", "purge"}, {}, "Deletes all snapshots.", "", &get_purge_arguments, &execute_purge); Shell::Action action_rollback( - {"snap", "rollback"}, {}, "Rollback image to snapshot.", "", + {"snap", "rollback"}, {"snap", "revert"}, "Rollback image to snapshot.", "", &get_rollback_arguments, &execute_rollback); Shell::Action action_protect( {"snap", "protect"}, {}, "Prevent a snapshot from being deleted.", "",