Fix missing space in vitastor-cli rm-osd "still up" message

rm-osd printed "OSD 1is still up" and "OSDs 2, 3are still up" because
the verb was appended to the OSD list without a space. Also say "it"
instead of "them" when only one OSD is up.

docs/usage/cli.en.md

@@ -470,8 +470,6 @@ 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,8 +487,6 @@ 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,7 +235,6 @@ 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_pool_modify.cpp

@@ -117,22 +117,6 @@ 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

src/cmd/cli_rm_osd.cpp

@@ -170,7 +170,8 @@ struct rm_osd_t
             }
             if (still_up.size() && !allow_up)
                 error += (still_up.size() == 1 ? "OSD " : "OSDs ") + implode(", ", still_up) +
-                    (still_up.size() == 1 ? "is" : "are") + " still up. Use `vitastor-disk purge` to delete them.\n";
+                    (still_up.size() == 1 ? " is" : " are") + " still up. Use `vitastor-disk purge` to delete " +
+                    (still_up.size() == 1 ? "it" : "them") + ".\n";
             if (is_dataloss && !force_dataloss && !dry_run)
                 error += "OSDs not deleted. Please move data to other OSDs or bypass this check with --allow-data-loss if you know what you are doing.\n";
             else if (is_warning && !force_warning && !dry_run)

tests/run_tests.sh

@@ -18,8 +18,6 @@ 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
 
@@ -68,6 +66,8 @@ OLD=1 ./test_move_reappear.sh
 
 ./test_rm_degraded.sh
 
+./test_rm_osd_msg.sh
+
 ./test_snapshot_chain.sh
 SCHEME=ec ./test_snapshot_chain.sh
 ENCRYPTED=1 ./test_snapshot_chain.sh

tests/test_modify_pool_name.sh

@@ -1,34 +0,0 @@
-#!/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

tests/test_rm_osd_msg.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -ex
+
+# Test the rm-osd message for OSDs that are still up
+
+. `dirname $0`/run_3osds.sh
+
+$VITASTOR_CLI rm-osd --dry-run 1 > ./testdata/one.txt 2>&1 && format_error "rm-osd of an up OSD was not refused"
+cat ./testdata/one.txt
+grep -q '^OSD 1 is still up\. Use `vitastor-disk purge` to delete it\.$' ./testdata/one.txt || format_error "bad message for one OSD"
+$VITASTOR_CLI rm-osd --dry-run 1 2 > ./testdata/two.txt 2>&1 && format_error "rm-osd of up OSDs was not refused"
+cat ./testdata/two.txt
+grep -q '^OSDs 1, 2 are still up\. Use `vitastor-disk purge` to delete them\.$' ./testdata/two.txt || format_error "bad message for two OSDs"
+
+format_green OK