WIP Implement resizing partitions created with vitastor-disk

src/disk_tool/disk_tool_prepare.cpp

@@ -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";
     }
     std::string out;
-    if (shell_exec({ "sfdisk", "--no-reread", "--no-tell-kernel", "--force", devinfo.path }, script, &out, NULL) != 0)
+    if (shell_exec({ "sfdisk", "--no-reread", "--force", devinfo.path }, script, &out, NULL) != 0)
     {
         fprintf(stderr, "Failed to add %zu partition(s) with sfdisk\n", sizes.size());
         return {};
@@ -355,9 +355,8 @@ json11::Json disk_tool_t::add_partitions(vitastor_dev_info_t & devinfo, std::vec
     {
         for (const auto & part: new_parts)
         {
-            std::string link_path = "/dev/disk/by-partuuid/"+strtolower(part["uuid"].string_value());
             struct stat st;
-            if (lstat(link_path.c_str(), &st) < 0)
+            if (stat(part["node"].string_value().c_str(), &st) < 0)
             {
                 if (errno == ENOENT)
                 {
@@ -378,7 +377,7 @@ json11::Json disk_tool_t::add_partitions(vitastor_dev_info_t & devinfo, std::vec
                 }
                 else
                 {
-                    fprintf(stderr, "Failed to lstat %s: %s\n", link_path.c_str(), strerror(errno));
+                    fprintf(stderr, "Failed to lstat %s: %s\n", part["node"].string_value().c_str(), strerror(errno));
                     return {};
                 }
             }
@@ -387,9 +386,8 @@ json11::Json disk_tool_t::add_partitions(vitastor_dev_info_t & devinfo, std::vec
     }
     // Wait until device symlinks in /dev/disk/by-partuuid/ appear
     bool exists = false;
-    const int max_iter = 300; // max 30 sec
     iter = 0;
-    while (!exists && iter < max_iter)
+    while (!exists && iter < 300) // max 30 sec
     {
         exists = true;
         for (const auto & part: new_parts)
@@ -399,13 +397,7 @@ json11::Json disk_tool_t::add_partitions(vitastor_dev_info_t & devinfo, std::vec
             if (lstat(link_path.c_str(), &st) < 0)
             {
                 if (errno == ENOENT)
-                {
                     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
                 {
                     fprintf(stderr, "Failed to lstat %s: %s\n", link_path.c_str(), strerror(errno));

src/disk_tool/disk_tool_resize_auto.cpp

@@ -80,8 +80,8 @@ int disk_tool_t::resize_data(std::string device)
     {
         std::string cmd;
         for (auto & kv: move_options)
-            cmd += "  "+kv.first+" = "+kv.second+"\n";
+            cmd += " --"+kv.first+" "+kv.second;
-        fprintf(stderr, "Running resize:\n%s", cmd.c_str());
+        fprintf(stderr, "Running resize%s\n", cmd.c_str());
     }
     if (!dry_run && raw_resize() != 0)
         return 1;

src/disk_tool/disk_tool_utils.cpp

@@ -377,7 +377,7 @@ int fix_partition_type(std::string dev_by_uuid)
         script += "\n";
     }
     std::string out;
-    return shell_exec({ "sfdisk", "--no-reread", "--no-tell-kernel", "--force", parent_dev }, script, &out, NULL);
+    return shell_exec({ "sfdisk", "--no-reread", "--force", parent_dev }, script, &out, NULL);
 }
 
 std::string csum_type_str(uint32_t data_csum_type)