thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework & fix pool-create / pool-modify / pool-ls

Browse Source
This commit is contained in:
Vitaliy Filippov
2024-02-28 13:08:04 +03:00
parent dc92851322
commit 86243b7101
13 changed files with 885 additions and 1368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli_pool_modify.cpp
+66 -149
View File
@@ -1,11 +1,7 @@
/*
=========================================================================
Copyright (c) 2023 MIND Software LLC. All Rights Reserved.
This file is part of the Software-Defined Storage MIND UStor Project.
For more information about this product, please visit https://mindsw.io
or contact us directly at info@mindsw.io
=========================================================================
*/
// Copyright (c) MIND Software LLC, 2023 (info@mindsw.io)
// I accept Vitastor CLA: see CLA-en.md for details
// Copyright (c) Vitaliy Filippov, 2024
// License: VNPL-1.1 (see README.md for details)
#include <ctype.h>
#include "cli.h"
@@ -18,26 +14,17 @@ struct pool_changer_t
cli_tool_t *parent;
// Required parameters (id/name)
pool_id_t pool_id = 0;
std::string pool_name;
json11::Json::object cfg;
json11::Json::object new_cfg;
bool force = false;
// Force removal
bool force;
// Pool configurator
pool_configurator_t *cfg;
json11::Json old_cfg;
int state = 0;
cli_result_t result;
// Config of pool to be modified
pool_config_t *pool_config = NULL;
// Tags
json11::Json osd_tags_json;
json11::Json primary_affinity_tags_json;
// Updated pools
json11::Json new_pools;
@@ -52,69 +39,18 @@ struct pool_changer_t
goto resume_1;
else if (state == 2)
goto resume_2;
else if (state == 3)
goto resume_3;
// Validate pool name/id
// Get pool id by name (if name given)
if (pool_name != "")
pool_id = stoull_full(cfg["old_name"].string_value());
if (!pool_id)
{
for (auto & pce: parent->cli->st_cli.pool_config)
pool_name = cfg["old_name"].string_value();
if (pool_name == "")
{
if (pce.second.name == pool_name)
{
pool_id = pce.first;
pool_config = &(pce.second);
break;
}
result = (cli_result_t){ .err = ENOENT, .text = "Pool ID or name is required to modify it" };
state = 100;
return;
}
}
// Otherwise, check if given pool id is valid
else
{
// Set pool name from id (for easier logging)
pool_name = "id " + std::to_string(pool_id);
// Look-up pool id in pool_config
auto pce = parent->cli->st_cli.pool_config.find(pool_id);
if (pce != parent->cli->st_cli.pool_config.end())
{
pool_config = &(pce->second);
}
}
// Need pool config to proceed
if (!pool_config)
{
result = (cli_result_t){ .err = ENOENT, .text = "Pool "+pool_name+" does not exist" };
state = 100;
return;
}
// Validate pool parameters
if (!cfg->validate(parent->cli->st_cli, pool_config, !force))
{
result = (cli_result_t){ .err = EINVAL, .text = cfg->get_error_string() + "\n" };
state = 100;
return;
}
// OSD tags
if (cfg->osd_tags != "")
{
osd_tags_json = parent->parse_tags(cfg->osd_tags);
}
// Primary affinity tags
if (cfg->primary_affinity_tags != "")
{
primary_affinity_tags_json = parent->parse_tags(cfg->primary_affinity_tags);
}
// Proceed to modifying the pool
state = 1;
resume_1:
resume_0:
// Get pools from etcd
parent->etcd_txn(json11::Json::object {
{ "success", json11::Json::array {
@@ -125,8 +61,8 @@ resume_1:
},
} },
});
state = 2;
resume_2:
state = 1;
resume_1:
if (parent->waiting > 0)
return;
if (parent->etcd_err.err)
@@ -139,43 +75,46 @@ resume_2:
// Parse received pools from etcd
auto kv = parent->cli->st_cli.parse_etcd_kv(parent->etcd_result["responses"][0]["response_range"]["kvs"][0]);
// Get pool by name or ID
old_cfg = json11::Json();
if (pool_name != "")
{
for (auto & pce: kv.value.object_items())
{
if (pce.second["name"] == pool_name)
{
pool_id = stoull_full(pce.first);
old_cfg = pce.second;
break;
}
}
}
else
{
pool_name = std::to_string(pool_id);
old_cfg = kv.value[pool_name];
}
if (!old_cfg.is_object())
{
result = (cli_result_t){ .err = ENOENT, .text = "Pool "+pool_name+" does not exist" };
state = 100;
return;
}
// Update pool
new_cfg = cfg;
result.text = validate_pool_config(new_cfg, old_cfg, parent->cli->st_cli.global_block_size,
parent->cli->st_cli.global_bitmap_granularity, force);
if (result.text != "")
{
result.err = EINVAL;
state = 100;
return;
}
// Update pool
auto pls = kv.value.object_items();
auto p = pls[std::to_string(pool_id)].object_items();
if (cfg->name != "")
p["name"] = cfg->name;
if (cfg->pg_size)
p["pg_size"] = cfg->pg_size;
if (cfg->pg_minsize)
p["pg_minsize"] = cfg->pg_minsize;
if (cfg->pg_count)
p["pg_count"] = cfg->pg_count;
if (cfg->failure_domain != "")
p["failure_domain"] = cfg->failure_domain;
if (cfg->max_osd_combinations)
p["max_osd_combinations"] = cfg->max_osd_combinations;
if (cfg->block_size)
p["block_size"] = cfg->block_size;
if (cfg->bitmap_granularity)
p["bitmap_granularity"] = cfg->bitmap_granularity;
if (cfg->immediate_commit != "")
p["immediate_commit"] = cfg->immediate_commit;
if (cfg->pg_stripe_size)
p["pg_stripe_size"] = cfg->pg_stripe_size;
if (cfg->root_node != "")
p["root_node"] = cfg->root_node;
if (cfg->scrub_interval != "")
p["scrub_interval"] = cfg->scrub_interval;
if (cfg->osd_tags != "")
p["osd_tags"] = osd_tags_json;
if (cfg->primary_affinity_tags != "")
p["primary_affinity_tags"] = primary_affinity_tags_json;
pls[std::to_string(pool_id)] = p;
// Record updated pools
pls[std::to_string(pool_id)] = new_cfg;
new_pools = pls;
// Expected pools mod revision
@@ -200,8 +139,8 @@ resume_2:
},
} },
});
state = 3;
resume_3:
state = 2;
resume_2:
if (parent->waiting > 0)
return;
if (parent->etcd_err.err)
@@ -210,12 +149,17 @@ resume_3:
state = 100;
return;
}
if (!parent->etcd_result["succeeded"].bool_value())
{
// CAS failure - retry
fprintf(stderr, "Warning: pool configuration was modified in the meantime by someone else\n");
goto resume_0;
}
// Successfully updated pool
result = (cli_result_t){
.err = 0,
.text = "Pool "+pool_name+" updated",
.data = new_pools
.data = new_pools,
};
state = 100;
}
@@ -225,35 +169,8 @@ std::function<bool(cli_result_t &)> cli_tool_t::start_pool_modify(json11::Json c
{
auto pool_changer = new pool_changer_t();
pool_changer->parent = this;
// Pool name (or id) required
if (!cfg["pool"].uint64_value() && cfg["pool"].as_string() == "")
{
return [](cli_result_t & result)
{
result = (cli_result_t){
.err = EINVAL, .text = "Pool name or id must be given\n"
};
return true;
};
}
pool_changer->pool_id = cfg["pool"].uint64_value();
pool_changer->pool_name = pool_changer->pool_id ? "" : cfg["pool"].as_string();
pool_changer->cfg = new pool_configurator_t();
if (!pool_changer->cfg->parse(cfg, false))
{
std::string err = pool_changer->cfg->get_error_string();
return [err](cli_result_t & result)
{
result = (cli_result_t){ .err = EINVAL, .text = err + "\n" };
return true;
};
}
pool_changer->force = !cfg["force"].is_null();
pool_changer->cfg = cfg.object_items();
pool_changer->force = cfg["force"].bool_value();
return [pool_changer](cli_result_t & result)
{
pool_changer->loop();