Fix vitastor-cli ls --tree hiding layers whose parent is filtered out

ls --tree built the tree starting from the roots of the selected layers,
so a layer whose parent was left out by a glob, -p or -n was never
reached and not printed at all: ls --tree testimg printed nothing when
testimg had a parent. Show such a layer as a root; its parent is still
shown in the PARENT column.

docs/usage/cli.en.md

@@ -410,8 +410,8 @@ Create a pool. Required parameters:
 
 | <!-- -->                 | <!-- -->                                                                                |
 |--------------------------|-----------------------------------------------------------------------------------------|
-| `-s R` or `--pg_size R`  | Number of replicas for replicated pools, from 1 to 64                                   |
-| `--ec N+K`               | Number of data (N) and parity (K) chunks for erasure-coded pools, N+K from 3 to 64      |
+| `-s R` or `--pg_size R`  | Number of replicas for replicated pools                                                 |
+| `--ec N+K`               | Number of data (N) and parity (K) chunks for erasure-coded pools                        |
 | `-n N` or `--pg_count N` | PG count for the new pool (start with 10*\<OSD count\>/pg_size rounded to a power of 2) |
 
 Optional parameters:

docs/usage/cli.ru.md

@@ -429,8 +429,8 @@ OSD  PARENT            UP    SIZE  USED%    TAGS          WEIGHT  BLOCK  BITMAP
 
 | <!-- -->                  | <!-- -->                                                                                      |
 |---------------------------|-----------------------------------------------------------------------------------------------|
-| `-s R` или `--pg_size R`  | Число копий данных для реплицированных пулов, от 1 до 64                                      |
-| `--ec N+K`                | Число частей данных (N) и чётности (K) для пулов с кодами коррекции ошибок, N+K от 3 до 64    |
+| `-s R` или `--pg_size R`  | Число копий данных для реплицированных пулов                                                  |
+| `--ec N+K`                | Число частей данных (N) и чётности (K) для пулов с кодами коррекции ошибок                    |
 | `-n N` или `--pg_count N` | Число PG для нового пула (начните с 10*\<число OSD\>/pg_size, округлённого до степени двойки) |
 
 Необязательные параметры:

src/cmd/cli.cpp

@@ -197,8 +197,8 @@ static const char* help_text =
     "\n"
     "vitastor-cli create-pool|pool-create <name> (-s <pg_size>|--ec <N>+<K>) -n <pg_count> [OPTIONS]\n"
     "  Create a pool. Required parameters:\n"
-    "    -s|--pg_size R   Number of replicas for replicated pools, from 1 to 64\n"
-    "    --ec N+K         Number of data (N) and parity (K) chunks for erasure-coded pools, N+K from 3 to 64\n"
+    "    -s|--pg_size R   Number of replicas for replicated pools\n"
+    "    --ec N+K         Number of data (N) and parity (K) chunks for erasure-coded pools\n"
     "    -n|--pg_count N  PG count for the new pool (start with 10*<OSD count>/pg_size rounded to a power of 2)\n"
     "  Optional parameters:\n"
     "    --pg_minsize <number>         R or N+K minus number of failures to tolerate without downtime\n"

src/cmd/cli_ls.cpp

@@ -250,11 +250,17 @@ 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();
-            children[parent_id].push_back(item);
+            // Layers with a filtered out parent are shown as roots
+            children[listed.find(parent_id) != listed.end() ? parent_id : 0].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_pool_cfg.cpp

@@ -233,10 +233,9 @@ std::string validate_pool_config(json11::Json::object & new_cfg, json11::Json ol
     {
         return "PG size can't be smaller than 3 for EC/XOR pools";
     }
-    // same limit as in etcd_state_client.cpp and mon/pool_config.js
-    if (pg_size > 64)
+    if (pg_size > 256)
     {
-        return "PG size can't be greater than 64";
+        return "PG size can't be greater than 256";
     }
 
     // PG rules

tests/run_tests.sh

@@ -48,8 +48,6 @@ OLD=1 SCHEME=ec IMMEDIATE_COMMIT=1 ./test_interrupted_rebalance.sh
 
 ./test_failure_domain.sh
 
-./test_pool_pg_size_limit.sh
-
 ./test_level_placement.sh
 
 ./test_snapshot.sh
@@ -124,6 +122,7 @@ 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

@@ -0,0 +1,40 @@
+#!/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_pool_pg_size_limit.sh

@@ -1,27 +0,0 @@
-#!/bin/bash -ex
-
-# Test that create-pool and modify-pool refuse pg_size > 64, which OSDs and clients don't support
-
-. `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"}}'
-
-for args in "create-pool bigpool -s 65 -n 1 --force" "create-pool bigpool --ec 62+3 -n 1 --force" "modify-pool testpool -s 65"; do
-    r=0
-    $VITASTOR_CLI $args || r=$?
-    if [[ $r != 22 ]]; then
-        format_error "$args should fail with EINVAL (22), but exited with $r"
-    fi
-done
-
-$ETCDCTL get --print-value-only /vitastor/config/pools | jq -e 'keys == ["1"] and .["1"].pg_size == 2' || \
-    format_error "Pool configuration should not change after refused commands"
-
-# 64 is still accepted
-$VITASTOR_CLI modify-pool testpool -s 64
-$ETCDCTL get --print-value-only /vitastor/config/pools | jq -e '.["1"].pg_size == 64' || \
-    format_error "modify-pool -s 64 should set pg_size to 64"
-
-format_green OK