From 0c193674eeaa1e7f1fd305b2ddc00c1ef139714d Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Fri, 20 Dec 2024 11:16:58 +0100 Subject: [PATCH] rbd: drop --pool option from "rbd group image {add,rm}" It stopped working with removal of get_special_pool_group_names() in commit 3e8624f157a1 ("rbd: add support for namespaces") over six years ago. Given how much time has passed, stop accepting this option. Signed-off-by: Ilya Dryomov (cherry picked from commit 1f71671dc65fa9e35d451e55d8963d60f3198a93) --- src/test/cli/rbd/help.t | 7 ++----- src/tools/rbd/action/Group.cc | 5 ----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t index fa08a17652773..e7598f801bb00 100644 --- a/src/test/cli/rbd/help.t +++ b/src/test/cli/rbd/help.t @@ -908,7 +908,7 @@ [--group-namespace ] [--group ] [--image-pool ] [--image-namespace ] - [--image ] [--pool ] + [--image ] Add an image to a group. @@ -926,7 +926,6 @@ --image-pool arg image pool name --image-namespace arg image namespace name --image arg image name - -p [ --pool ] arg pool name unless overridden rbd help group image list usage: rbd group image list [--format ] [--pretty-format] @@ -952,8 +951,7 @@ [--group-namespace ] [--group ] [--image-pool ] [--image-namespace ] - [--image ] [--pool ] - [--image-id ] + [--image ] [--image-id ] Remove an image from a group. @@ -971,7 +969,6 @@ --image-pool arg image pool name --image-namespace arg image namespace name --image arg image name - -p [ --pool ] arg pool name unless overridden --image-id arg image id rbd help group list diff --git a/src/tools/rbd/action/Group.cc b/src/tools/rbd/action/Group.cc index b2d2e97504872..9ea5ee47c1124 100644 --- a/src/tools/rbd/action/Group.cc +++ b/src/tools/rbd/action/Group.cc @@ -799,9 +799,6 @@ void get_add_arguments(po::options_description *positional, add_prefixed_pool_option(options, "image"); add_prefixed_namespace_option(options, "image"); at::add_image_option(options, at::ARGUMENT_MODIFIER_NONE); - - at::add_pool_option(options, at::ARGUMENT_MODIFIER_NONE, - " unless overridden"); } void get_remove_image_arguments(po::options_description *positional, @@ -824,8 +821,6 @@ void get_remove_image_arguments(po::options_description *positional, add_prefixed_namespace_option(options, "image"); at::add_image_option(options, at::ARGUMENT_MODIFIER_NONE); - at::add_pool_option(options, at::ARGUMENT_MODIFIER_NONE, - " unless overridden"); at::add_image_id_option(options); } -- 2.39.5