Allow to remove level_placement with an empty modify-pool value

An empty --level_placement was dropped before the merge with the old
pool config, so the old rules stayed and could not be removed at all,
and a malformed value was silently dropped the same way. Make an empty
value remove the key, which the monitor treats as no extra rules, and
refuse a value that is not <level>=<rule>[,...] with EINVAL.

docs/usage/cli.en.md

@@ -425,7 +425,7 @@ Optional parameters:
 | `--block_size 128k`            | Put pool only on OSDs with this data block size                            |
 | `--bitmap_granularity 4k`      | Put pool only on OSDs with this logical sector size                        |
 | `--immediate_commit none`      | Put pool only on OSDs with this or larger immediate_commit (none < small < all) |
-| `--level_placement <rules>`    | Use additional failure domain rules (example: "dc=112233")                 |
+| `--level_placement <rules>`    | Use additional failure domain rules (example: "dc=112233", "" to remove)   |
 | `--raw_placement <rules>`      | Specify raw PG generation rules ([details](../config/pool.en.md#raw_placement)) |
 | `--local_reads primary`        | Local read policy for replicated pools: primary, nearest or random         |
 | `--primary_affinity_tags tags` | Prefer to put primary copies on OSDs with all specified tags               |

docs/usage/cli.ru.md

@@ -444,7 +444,7 @@ OSD  PARENT            UP    SIZE  USED%    TAGS          WEIGHT  BLOCK  BITMAP
 | `--block_size 128k`            | ...только OSD с данным размером блока                                      |
 | `--bitmap_granularity 4k`      | ...только OSD с данным размером логического сектора                        |
 | `--immediate_commit none`      | ...только OSD с этим или большим immediate_commit (none < small < all)     |
-| `--level_placement <rules>`    | Задать правила дополнительных доменов отказа (пример: "dc=112233")         |
+| `--level_placement <rules>`    | Задать правила дополнительных доменов отказа (пример: "dc=112233", "" — удалить) |
 | `--raw_placement <rules>`      | Задать низкоуровневые правила генерации PG ([детали](../config/pool.ru.md#raw_placement)) |
 | `--local_reads primary`        | Политика локальных чтений для реплик: primary, nearest или random          |
 | `--primary_affinity_tags tags` | Предпочитать OSD со всеми данными тегами для роли первичных                |

src/cmd/cli.cpp

@@ -208,7 +208,7 @@ static const char* help_text =
     "    --block_size 128k             Put pool only on OSDs with this data block size\n"
     "    --bitmap_granularity 4k       Put pool only on OSDs with this logical sector size\n"
     "    --immediate_commit all        Put pool only on OSDs with this or larger immediate_commit (none < small < all)\n"
-    "    --level_placement <rules>     Use additional failure domain rules (example: \"dc=112233\")\n"
+    "    --level_placement <rules>     Use additional failure domain rules (example: \"dc=112233\", \"\" to remove)\n"
     "    --raw_placement <rules>       Specify raw PG generation rules (see documentation for details)\n"
     "    --local_reads primary         Local read policy for replicated pools: primary, nearest or random\n"
     "    --primary_affinity_tags tags  Prefer to put primary copies on OSDs with all specified tags\n"

src/cmd/cli_pg_ls.cpp

@@ -251,7 +251,7 @@ resume_1:
             { "title", "MISPLACED" },
         });
         cols.push_back(json11::Json::object{
-            { "key", "fmt_degraded" },
+            { "key", "fmt_misplaced" },
             { "title", "DEGRADED" },
         });
         cols.push_back(json11::Json::object{
@@ -273,8 +273,6 @@ resume_1:
         load_pg_stats();
         if (parent->waiting > 0)
             return;
-        if (state == 100)
-            return;
         format_pgs();
         state = 100;
     }

src/cmd/cli_pool_cfg.cpp

@@ -103,24 +103,22 @@ std::string validate_pool_config(json11::Json::object & new_cfg, json11::Json ol
             // level=rule, level=rule, ...
             if (!value.is_object())
             {
+                if (!value.is_null() && !value.is_string())
+                {
+                    return key+" must be a string";
+                }
                 json11::Json::object obj;
                 for (auto & item: explode(",", value.string_value(), true))
                 {
                     auto pair = explode("=", item, true);
-                    if (pair.size() >= 2)
+                    if (pair.size() != 2)
                     {
-                        obj[pair[0]] = pair[1];
+                        return "--level_placement must be <level>=<rule>[,<level>=<rule>...], but it is "+value.string_value();
                     }
+                    obj[pair[0]] = pair[1];
                 }
-                if (obj.size())
-                {
-                    value = obj;
-                }
-                else
-                {
-                    new_cfg.erase(kv_it++);
-                    continue;
-                }
+                // empty value = remove the rules; null keeps the old ones from being merged back
+                value = obj.size() ? json11::Json(obj) : json11::Json();
             }
         }
         else if (key == "osd_tags" || key == "primary_affinity_tags")
@@ -169,6 +167,10 @@ std::string validate_pool_config(json11::Json::object & new_cfg, json11::Json ol
     {
         new_cfg.erase("local_reads");
     }
+    if (new_cfg.find("level_placement") != new_cfg.end() && new_cfg["level_placement"].is_null())
+    {
+        new_cfg.erase("level_placement");
+    }
 
     // Prevent autovivification of object keys. Now we don't modify the config, we just check it
     json11::Json cfg = new_cfg;

tests/run_tests.sh

@@ -61,7 +61,6 @@ OLD=1 SCHEME=ec ./test_snapshot.sh
 OLD=1 ./test_move_reappear.sh
 
 ./test_degraded.sh
-./test_pg_ls.sh
 
 ./test_rm.sh
 

tests/test_level_placement.sh

@@ -36,4 +36,23 @@ $ETCDCTL get --prefix /vitastor/pg/config --print-value-only | \
         (. | map_values((. - 1) / 2 | floor) | unique | length) == 6 and
         (. | map_values((. - 1) / 4 | floor) | unique | length) == 3) ] | length) == 32'
 
+# A malformed --level_placement is refused, an empty one removes the rules
+r=0
+$VITASTOR_CLI modify-pool testpool --level_placement rack || r=$?
+if [[ $r != 22 ]]; then
+    format_error "modify-pool --level_placement rack should fail with EINVAL (22), but exited with $r"
+fi
+$ETCDCTL get --print-value-only /vitastor/config/pools | jq -e '.["1"].level_placement == {"rack":"112233"}' || \
+    format_error "level_placement should stay rack=112233 after a refused change"
+$VITASTOR_CLI modify-pool testpool --level_placement ''
+$ETCDCTL get --print-value-only /vitastor/config/pools | jq -e '.["1"] | has("level_placement") | not' || \
+    format_error "modify-pool --level_placement '' should remove level_placement"
+sleep 2
+if grep -q 'configuration is invalid' ./testdata/mon.log; then
+    format_error "Monitor refused the pool configuration without level_placement"
+fi
+$ETCDCTL get --prefix /vitastor/pg/config --print-value-only | \
+    jq -s -e '([ .[0].items["1"] | .[].osd_set | map_values(. | tonumber) | select(
+        (. | map_values((. - 1) / 2 | floor) | unique | length) == 6) ] | length) == 32'
+
 format_green OK

tests/test_pg_ls.sh

@@ -1,47 +0,0 @@
-#!/bin/bash -ex
-
-# Test vitastor-cli ls-pgs on degraded PGs
-
-PG_COUNT=4
-PG_SIZE=3
-PG_MINSIZE=2
-# Keep degraded objects until the checks are done
-GLOBAL_CONFIG=',"no_recovery":true'
-. `dirname $0`/run_3osds.sh
-
-$VITASTOR_CLI create -s 32M testimg
-
-# Data written while OSD 3 is down is degraded when it comes back
-kill -9 $OSD3_PID
-$ETCDCTL del /vitastor/osd/state/3
-wait_condition 60 "$ETCDCTL get --prefix /vitastor/pg/state/ --print-value-only | jq -s -e '[ .[] | select(.state | index(\"degraded\")) ] | length == $PG_COUNT'" "PG peering without OSD 3"
-$VITASTOR_CLI dd if=/dev/urandom oimg=testimg bs=1M count=32
-start_osd 3
-wait_condition 60 "$ETCDCTL get --prefix /vitastor/pgstats/ --print-value-only | jq -s -e '[ .[] | select(.degraded_count > 0) ] | length == $PG_COUNT'" "PG degradation"
-
-$VITASTOR_CLI ls-pgs
-
-# NUM and DEGRADED of every PG from the table, and degraded_count from JSON
-$VITASTOR_CLI ls-pgs | awk 'NR == 1 { n = index($0, "NUM"); d = index($0, "DEGRADED"); e = index($0, "INCOMPLETE") }
-    NR > 1 { num = substr($0, n); sub(/ .*/, "", num); deg = substr($0, d, e-d); sub(/ +$/, "", deg); print num " " deg }' > ./testdata/pg_ls.txt
-$VITASTOR_CLI ls-pgs --json | jq -r '.[] | "\(.pg_num) \(.degraded_count // 0)"' > ./testdata/pg_ls_json.txt
-
-if [[ $(wc -l < ./testdata/pg_ls.txt) != $PG_COUNT ]]; then
-    format_error "ls-pgs should list $PG_COUNT PGs"
-fi
-while read num count; do
-    shown=$(awk '$1 == '$num' { $1 = ""; sub(/^ /, ""); print }' ./testdata/pg_ls.txt)
-    if [[ -z "$shown" || $count -gt 0 && "$shown" = "0 B" || $count -eq 0 && "$shown" != "0 B" ]]; then
-        format_error "ls-pgs shows DEGRADED=$shown for PG $num with $count degraded objects"
-    fi
-done < ./testdata/pg_ls_json.txt
-
-# An unknown pool is an error, not an empty table
-if out=$($VITASTOR_CLI ls-pgs --pool nosuchpool 2>&1); then
-    format_error "ls-pgs should fail for an unknown pool"
-fi
-if [[ "$out" != "Pool nosuchpool not found" ]]; then
-    format_error "ls-pgs prints '$out' instead of the unknown pool error"
-fi
-
-format_green OK