Suppress warnings in vitastor-disk purge correctly
parent
fa90f287da
commit
68f3fb795e
|
@ -152,7 +152,7 @@ struct rm_osd_t
|
||||||
result.text = error;
|
result.text = error;
|
||||||
if (dry_run || is_dataloss && !force_dataloss || is_warning && !force_warning)
|
if (dry_run || is_dataloss && !force_dataloss || is_warning && !force_warning)
|
||||||
{
|
{
|
||||||
result.err = is_dataloss || is_warning ? EBUSY : 0;
|
result.err = is_dataloss && !force_dataloss || is_warning && !force_warning ? EBUSY : 0;
|
||||||
state = 100;
|
state = 100;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -387,6 +387,14 @@ int disk_tool_t::purge_devices(const std::vector<std::string> & devices)
|
||||||
rm_osd_cli.push_back(std::to_string(osd_num));
|
rm_osd_cli.push_back(std::to_string(osd_num));
|
||||||
}
|
}
|
||||||
// Check for data loss
|
// Check for data loss
|
||||||
|
if (options["force"] != "")
|
||||||
|
{
|
||||||
|
rm_osd_cli.push_back("--force");
|
||||||
|
}
|
||||||
|
else if (options["allow_data_loss"] != "")
|
||||||
|
{
|
||||||
|
rm_osd_cli.push_back("--allow-data-loss");
|
||||||
|
}
|
||||||
rm_osd_cli.push_back("--dry-run");
|
rm_osd_cli.push_back("--dry-run");
|
||||||
std::string dry_run_ignore_stdout;
|
std::string dry_run_ignore_stdout;
|
||||||
if (shell_exec(rm_osd_cli, "", &dry_run_ignore_stdout, NULL) != 0)
|
if (shell_exec(rm_osd_cli, "", &dry_run_ignore_stdout, NULL) != 0)
|
||||||
|
@ -405,14 +413,6 @@ int disk_tool_t::purge_devices(const std::vector<std::string> & devices)
|
||||||
}
|
}
|
||||||
// Remove OSD metadata
|
// Remove OSD metadata
|
||||||
rm_osd_cli.pop_back();
|
rm_osd_cli.pop_back();
|
||||||
if (options["force"] != "")
|
|
||||||
{
|
|
||||||
rm_osd_cli.push_back("--force");
|
|
||||||
}
|
|
||||||
else if (options["allow_data_loss"] != "")
|
|
||||||
{
|
|
||||||
rm_osd_cli.push_back("--allow-data-loss");
|
|
||||||
}
|
|
||||||
if (shell_exec(rm_osd_cli, "", NULL, NULL) != 0)
|
if (shell_exec(rm_osd_cli, "", NULL, NULL) != 0)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
|
|
Loading…
Reference in New Issue