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

Run partprobe in add_partition() if /dev/disk/by-partuuid symlink is not present

Browse Source
This commit is contained in:
Vitaliy Filippov
2024-10-12 18:07:53 +03:00
parent d27a8bdabc
commit 4e8a1a8895
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/disk_tool/disk_tool_prepare.cpp
+12 -4
View File
@@ -328,7 +328,7 @@ json11::Json disk_tool_t::add_partitions(vitastor_dev_info_t & devinfo, std::vec
script += "+ "+size+" "+std::string(VITASTOR_PART_TYPE)+"\n"; script += "+ "+size+" "+std::string(VITASTOR_PART_TYPE)+"\n";
} }
std::string out; std::string out;
if (shell_exec({ "sfdisk", "--no-reread", "--force", devinfo.path }, script, &out, NULL) != 0) if (shell_exec({ "sfdisk", "--no-reread", "--no-tell-kernel", "--force", devinfo.path }, script, &out, NULL) != 0)
{ {
fprintf(stderr, "Failed to add %zu partition(s) with sfdisk\n", sizes.size()); fprintf(stderr, "Failed to add %zu partition(s) with sfdisk\n", sizes.size());
return {}; return {};
@@ -355,8 +355,9 @@ json11::Json disk_tool_t::add_partitions(vitastor_dev_info_t & devinfo, std::vec
{ {
for (const auto & part: new_parts) for (const auto & part: new_parts)
{ {
std::string link_path = "/dev/disk/by-partuuid/"+strtolower(part["uuid"].string_value());
struct stat st; struct stat st;
if (stat(part["node"].string_value().c_str(), &st) < 0) if (lstat(link_path.c_str(), &st) < 0)
{ {
if (errno == ENOENT) if (errno == ENOENT)
{ {
@@ -377,7 +378,7 @@ json11::Json disk_tool_t::add_partitions(vitastor_dev_info_t & devinfo, std::vec
} }
else else
{ {
fprintf(stderr, "Failed to lstat %s: %s\n", part["node"].string_value().c_str(), strerror(errno)); fprintf(stderr, "Failed to lstat %s: %s\n", link_path.c_str(), strerror(errno));
return {}; return {};
} }
} }
@@ -386,8 +387,9 @@ json11::Json disk_tool_t::add_partitions(vitastor_dev_info_t & devinfo, std::vec
} }
// Wait until device symlinks in /dev/disk/by-partuuid/ appear // Wait until device symlinks in /dev/disk/by-partuuid/ appear
bool exists = false; bool exists = false;
const int max_iter = 300; // max 30 sec
iter = 0; iter = 0;
while (!exists && iter < 300) // max 30 sec while (!exists && iter < max_iter)
{ {
exists = true; exists = true;
for (const auto & part: new_parts) for (const auto & part: new_parts)
@@ -397,7 +399,13 @@ json11::Json disk_tool_t::add_partitions(vitastor_dev_info_t & devinfo, std::vec
if (lstat(link_path.c_str(), &st) < 0) if (lstat(link_path.c_str(), &st) < 0)
{ {
if (errno == ENOENT) if (errno == ENOENT)
{
exists = false; exists = false;
if (iter == 4)
{
fprintf(stderr, "Waiting for %s to appear for up to %d sec...\n", link_path.c_str(), max_iter/10);
}
}
else else
{ {
fprintf(stderr, "Failed to lstat %s: %s\n", link_path.c_str(), strerror(errno)); fprintf(stderr, "Failed to lstat %s: %s\n", link_path.c_str(), strerror(errno));
src/disk_tool/disk_tool_utils.cpp
+1 -1
View File
@@ -377,7 +377,7 @@ int fix_partition_type(std::string dev_by_uuid)
script += "\n"; script += "\n";
} }
std::string out; std::string out;
return shell_exec({ "sfdisk", "--no-reread", "--force", parent_dev }, script, &out, NULL); return shell_exec({ "sfdisk", "--no-reread", "--no-tell-kernel", "--force", parent_dev }, script, &out, NULL);
} }
std::string csum_type_str(uint32_t data_csum_type) std::string csum_type_str(uint32_t data_csum_type)