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.

src/cmd/cli_ls.cpp

@@ -250,17 +250,11 @@ resume_1:
 
     json11::Json::array to_tree(const json11::Json::array & array)
     {
-        std::set<uint64_t> listed;
-        for (const auto & item: array)
-        {
-            listed.insert(item["inode_id"].uint64_value());
-        }
         std::map<uint64_t, json11::Json::array> children;
         for (const auto & item: array)
         {
             uint64_t parent_id = item["parent_inode_id"].uint64_value();
-            // Layers with a filtered out parent are shown as roots
-            children[listed.find(parent_id) != listed.end() ? parent_id : 0].push_back(item);
+            children[parent_id].push_back(item);
         }
         json11::Json::array tree;
         std::function<void(uint64_t, const std::string &)> add_children = [&](uint64_t parent_id, const std::string & prefix)

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

@@ -66,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
@@ -122,7 +124,6 @@ OLD=1 ./test_corrupt_all.sh
 
 ./test_reweight_half.sh
 ./test_snapshot_pool2.sh
-./test_ls_tree.sh
 ./test_snapshot_read_bitmap.sh
 
 TEST_NAME=csum_32k_dmj OSD_ARGS="--data_csum_type crc32c --csum_block_size 32k --inmemory_metadata false --inmemory_journal false" OFFSET_ARGS=$OSD_ARGS ./test_heal.sh

tests/test_ls_tree.sh

@@ -1,40 +0,0 @@
-#!/bin/bash -ex
-
-# Test vitastor-cli ls --tree with filters which leave out parent layers
-
-. `dirname $0`/run_3osds.sh
-
-$VITASTOR_CLI create -s 128M testimg
-$VITASTOR_CLI snap-create testimg@snap1
-$VITASTOR_CLI create --parent testimg@snap1 testclone
-
-$VITASTOR_CLI create-pool testpool2 -s 3 -n 4 --failure_domain osd
-wait_pool_up 30 2 3 4
-$VITASTOR_CLI create --parent testimg@snap1 -p testpool2 testclone2
-
-# First column of each row without the header
-check_tree()
-{
-    local expected=$1
-    shift
-    local rows=$($VITASTOR_CLI ls --tree "$@" | tail -n +2 | sed 's/  .*//' | tr '\n' ';')
-    if [[ "$rows" != "$expected" ]]; then
-        format_error "ls --tree $* shows '$rows', expected '$expected'"
-    fi
-}
-
-$VITASTOR_CLI ls --tree
-
-check_tree 'testimg@snap1;├─ testclone;├─ testclone2;└─ testimg;'
-check_tree 'testimg@snap1;└─ testimg;' 'testimg*'
-# Layers whose parent is filtered out are shown as roots
-check_tree 'testimg;' testimg
-check_tree 'testclone;testimg;' testclone testimg
-check_tree 'testclone;' -n 1
-check_tree 'testclone2;' -p testpool2
-
-if ! $VITASTOR_CLI ls --tree testimg | grep -q ' testimg@snap1 *$'; then
-    format_error "ls --tree testimg should show testimg@snap1 as the parent"
-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