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

Do not try to purge the same OSD multiple times if its multiple devices are passed to purge

Browse Source
This commit is contained in:
Vitaliy Filippov
2024-07-16 16:48:16 +03:00
parent e898335b8d
commit 8239ea2356
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/disk_tool/disk_tool_udev.cpp
+6 -3
View File
@@ -383,7 +383,7 @@ int disk_tool_t::pre_exec_osd(std::string device)
int disk_tool_t::purge_devices(const std::vector<std::string> & devices) int disk_tool_t::purge_devices(const std::vector<std::string> & devices)
{ {
std::vector<uint64_t> osd_numbers; std::set<uint64_t> osd_numbers;
json11::Json::array superblocks; json11::Json::array superblocks;
for (auto & device: devices) for (auto & device: devices)
{ {
@@ -391,8 +391,11 @@ int disk_tool_t::purge_devices(const std::vector<std::string> & devices)
if (!sb.is_null()) if (!sb.is_null())
{ {
uint64_t osd_num = sb["params"]["osd_num"].uint64_value(); uint64_t osd_num = sb["params"]["osd_num"].uint64_value();
osd_numbers.push_back(osd_num); if (osd_numbers.find(osd_num) == osd_numbers.end())
superblocks.push_back(sb); {
osd_numbers.insert(osd_num);
superblocks.push_back(sb);
}
} }
} }
if (!osd_numbers.size()) if (!osd_numbers.size())