Skip to content

Commit 1f71671

Browse files
committed
rbd: drop --pool option from "rbd group image {add,rm}"
It stopped working with removal of get_special_pool_group_names() in commit 3e8624f ("rbd: add support for namespaces") over six years ago. Given how much time has passed, stop accepting this option. Signed-off-by: Ilya Dryomov <[email protected]>
1 parent f35e3a6 commit 1f71671

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

src/test/cli/rbd/help.t

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@
916916
[--group-namespace <group-namespace>]
917917
[--group <group>] [--image-pool <image-pool>]
918918
[--image-namespace <image-namespace>]
919-
[--image <image>] [--pool <pool>]
919+
[--image <image>]
920920
<group-spec> <image-spec>
921921

922922
Add an image to a group.
@@ -934,7 +934,6 @@
934934
--image-pool arg image pool name
935935
--image-namespace arg image namespace name
936936
--image arg image name
937-
-p [ --pool ] arg pool name unless overridden
938937

939938
rbd help group image list
940939
usage: rbd group image list [--format <format>] [--pretty-format]
@@ -960,8 +959,7 @@
960959
[--group-namespace <group-namespace>]
961960
[--group <group>] [--image-pool <image-pool>]
962961
[--image-namespace <image-namespace>]
963-
[--image <image>] [--pool <pool>]
964-
[--image-id <image-id>]
962+
[--image <image>] [--image-id <image-id>]
965963
<group-spec> <image-spec>
966964

967965
Remove an image from a group.
@@ -979,7 +977,6 @@
979977
--image-pool arg image pool name
980978
--image-namespace arg image namespace name
981979
--image arg image name
982-
-p [ --pool ] arg pool name unless overridden
983980
--image-id arg image id
984981

985982
rbd help group info

src/tools/rbd/action/Group.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -964,9 +964,6 @@ void get_add_arguments(po::options_description *positional,
964964
add_prefixed_pool_option(options, "image");
965965
add_prefixed_namespace_option(options, "image");
966966
at::add_image_option(options, at::ARGUMENT_MODIFIER_NONE);
967-
968-
at::add_pool_option(options, at::ARGUMENT_MODIFIER_NONE,
969-
" unless overridden");
970967
}
971968

972969
void get_remove_image_arguments(po::options_description *positional,
@@ -989,8 +986,6 @@ void get_remove_image_arguments(po::options_description *positional,
989986
add_prefixed_namespace_option(options, "image");
990987
at::add_image_option(options, at::ARGUMENT_MODIFIER_NONE);
991988

992-
at::add_pool_option(options, at::ARGUMENT_MODIFIER_NONE,
993-
" unless overridden");
994989
at::add_image_id_option(options);
995990
}
996991

0 commit comments

Comments
 (0)