Fix incorrect "changing scheme" message in modify-pool

2024-03-06 00:39:56 +03:00 · 2024-03-06 00:39:56 +03:00 · aa79d1db1c
parent a1fecb7eff
commit aa79d1db1c
1 changed files with 6 additions and 4 deletions
--- a/src/cli_pool_cfg.cpp
+++ b/src/cli_pool_cfg.cpp
@ -64,10 +64,6 @@ std::string validate_pool_config(json11::Json::object & new_cfg, json11::Json ol
                (new_cfg["parity_chunks"].uint64_value() > 1 ? 1 : 0);
        }
    }
-    if (new_cfg["scheme"] != "ec")
-    {
-        new_cfg.erase("parity_chunks");
-    }

    // Check integer values and unknown keys
    for (auto kv_it = new_cfg.begin(); kv_it != new_cfg.end(); )
@ -118,6 +114,12 @@ std::string validate_pool_config(json11::Json::object & new_cfg, json11::Json ol
        }
    }

+    // Check after merging
+    if (new_cfg["scheme"] != "ec")
+    {
+        new_cfg.erase("parity_chunks");
+    }
+
    // Prevent autovivification of object keys. Now we don't modify the config, we just check it
    json11::Json cfg = new_cfg;