Refuse renaming a pool to the name of another pool in vitastor-cli

modify-pool --name did not check the new name against other pools, so
two pools could end up with the same name, and commands addressing a
pool by name then picked either of them. Fail with EEXIST, as
create-pool does. The check uses the pool list that the CAS write is
based on, so a concurrent rename or create is caught by the retry.

docs/usage/cli.en.md

@@ -470,6 +470,8 @@ These, however, can still be modified with -f|--force.
 
 See [create-pool](#create-pool) for parameter descriptions.
 
+Renaming with --name fails if another pool already has the new name.
+
 Examples:
 
 `vitastor-cli modify-pool pool_A --name pool_B`

docs/usage/cli.ru.md

@@ -487,6 +487,8 @@ OSD  PARENT            UP    SIZE  USED%    TAGS          WEIGHT  BLOCK  BITMAP
 
 Описания параметров смотрите в [create-pool](#create-pool).
 
+Переименование с --name завершается ошибкой, если у другого пула уже есть такое имя.
+
 Примеры:
 
 `vitastor-cli modify-pool pool_A --name pool_B`

src/cmd/cli.cpp

@@ -235,6 +235,7 @@ static const char* help_text =
     "    [--immediate_commit <all|small|none>] [--pg_stripe_size <size>]\n"
     "  These, however, can still be modified with -f|--force.\n"
     "  See create-pool for parameter descriptions.\n"
+    "  Renaming with --name fails if another pool already has the new name.\n"
     "  Examples:\n"
     "    vitastor-cli modify-pool pool_A --name pool_B\n"
     "    vitastor-cli modify-pool 2 --pg_size 4 -n 128\n"

src/cmd/cli_modify.cpp

@@ -287,20 +287,7 @@ std::function<bool(cli_result_t &)> cli_tool_t::start_modify(json11::Json cfg)
     changer->parent = this;
     changer->image_name = cfg["image"].string_value();
     changer->new_name = cfg["rename"].string_value();
-    if (!cfg["resize"].is_null())
-    {
-        bool ok = false;
-        changer->new_size = parse_size(cfg["resize"].as_string(), &ok);
-        if (!ok)
-        {
-            delete changer;
-            return [size = cfg["resize"].as_string()](cli_result_t & result)
-            {
-                result = (cli_result_t){ .err = EINVAL, .text = "Invalid syntax for size: "+size };
-                return true;
-            };
-        }
-    }
+    changer->new_size = parse_size(cfg["resize"].as_string());
     changer->force_size = cfg["force_size"].bool_value();
     changer->inc_size = cfg["inc_size"].bool_value();
     changer->force = cfg["force"].bool_value();

src/cmd/cli_pool_modify.cpp

@@ -117,6 +117,22 @@ resume_1:
                 return;
             }
 
+            if (new_cfg["name"] != old_cfg["name"])
+            {
+                for (auto & pce: kv.value.object_items())
+                {
+                    if (pce.second["name"] == new_cfg["name"])
+                    {
+                        result = (cli_result_t){
+                            .err = EEXIST,
+                            .text = "Pool with name \""+new_cfg["name"].string_value()+"\" already exists (ID "+pce.first+")",
+                        };
+                        state = 100;
+                        return;
+                    }
+                }
+            }
+
             if (new_cfg.find("used_for_app") != new_cfg.end() && !force)
             {
                 // Check that pool doesn't have images

tests/run_tests.sh

@@ -18,6 +18,8 @@ SCHEME=ec ./test_change_pg_count.sh
 
 ./test_create_nomaxid.sh
 
+./test_modify_pool_name.sh
+
 ./test_etcd_fail.sh
 ANTIETCD=1 ./test_etcd_fail.sh
 
@@ -64,8 +66,6 @@ OLD=1 ./test_move_reappear.sh
 
 ./test_rm.sh
 
-./test_modify_image_resize.sh
-
 ./test_rm_degraded.sh
 
 ./test_snapshot_chain.sh

tests/test_modify_image_resize.sh

@@ -1,28 +0,0 @@
-#!/bin/bash -ex
-
-# Test that modify refuses an invalid --resize value instead of ignoring it
-
-. `dirname $0`/common.sh
-
-wait_etcd
-
-$ETCDCTL put /vitastor/config/pools '{"1":{"name":"testpool","scheme":"replicated","pg_size":2,"pg_minsize":1,"pg_count":1,"failure_domain":"osd"}}'
-
-$VITASTOR_CLI create -s 1G --pool testpool testimg
-
-for size in 1.5G 10X abc ''; do
-    r=0
-    $VITASTOR_CLI modify testimg --resize "$size" || r=$?
-    if [[ $r != 22 ]]; then
-        format_error "modify --resize '$size' should fail with EINVAL (22), but exited with $r"
-    fi
-done
-
-$ETCDCTL get --print-value-only /vitastor/config/inode/1/1 | jq -e '.size == 1073741824' || \
-    format_error "Image size should stay 1G after refused resizes"
-
-$VITASTOR_CLI modify testimg --resize 2G
-$ETCDCTL get --print-value-only /vitastor/config/inode/1/1 | jq -e '.size == 2147483648' || \
-    format_error "Image size should be 2G after --resize 2G"
-
-format_green OK

tests/test_modify_pool_name.sh

@@ -0,0 +1,34 @@
+#!/bin/bash -ex
+
+# Test that modify-pool --name refuses to take the name of another pool
+
+. `dirname $0`/common.sh
+
+wait_etcd
+
+POOL='"scheme":"replicated","pg_size":2,"pg_minsize":1,"pg_count":1,"failure_domain":"osd"'
+$ETCDCTL put /vitastor/config/pools '{"1":{"name":"pool1",'$POOL'},"2":{"name":"pool2",'$POOL'}}'
+
+for p in pool2 2; do
+    r=0
+    $VITASTOR_CLI modify-pool $p --name pool1 || r=$?
+    if [[ $r != 17 ]]; then
+        format_error "modify-pool $p --name pool1 should fail with EEXIST (17), but exited with $r"
+    fi
+done
+
+names=$($ETCDCTL get --print-value-only /vitastor/config/pools | jq -c '[ .[].name ]')
+if [[ "$names" != '["pool1","pool2"]' ]]; then
+    format_error "Pool names should stay pool1, pool2, but they are $names"
+fi
+
+# A free name and the pool's own name are still accepted
+$VITASTOR_CLI modify-pool pool2 --name pool3
+$VITASTOR_CLI modify-pool pool3 --name pool3 --pg_count 2
+
+cfg=$($ETCDCTL get --print-value-only /vitastor/config/pools | jq -c '[ .[] | [ .name, .pg_count ] ]')
+if [[ "$cfg" != '[["pool1",1],["pool3",2]]' ]]; then
+    format_error "Pools should be pool1 (1 PG) and pool3 (2 PGs), but they are $cfg"
+fi
+
+format_green OK