Add librdmacm-dev to build-deps

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Vitaliy Filippov <vitalif@yourcmc.ru>
 Build-Depends: debhelper, g++ (>= 8), libstdc++6 (>= 8),
   linux-libc-dev, libgoogle-perftools-dev, libjerasure-dev, libgf-complete-dev,
-  libibverbs-dev, libisal-dev, cmake, pkg-config, libnl-3-dev, libnl-genl-3-dev,
+  libibverbs-dev, librdmacm-dev, libisal-dev, cmake, pkg-config, libnl-3-dev, libnl-genl-3-dev,
   node-bindings <!nocheck>, node-gyp, node-nan
 Standards-Version: 4.5.0
 Homepage: https://vitastor.io/

docs/usage/disk.en.md

@@ -73,8 +73,6 @@ Options (automatic mode):
 --max_other 10%
   Use disks for OSD data even if they already have non-Vitastor partitions,
   but only if these take up no more than this percent of disk space.
---dry-run
-  Check and print new OSD count for each disk but do not actually create them.
 ```
 
 Options (single-device mode):

docs/usage/disk.ru.md

@@ -74,8 +74,6 @@ vitastor-disk - инструмент командной строки для уп
 --max_other 10%
   Использовать диски под данные OSD, даже если на них уже есть не-Vitastor-овые
   разделы, но только в случае, если они занимают не более данного процента диска.
---dry-run
-  Проверить и вывести число новых OSD для каждого диска, но не создавать их.
 ```
 
 Опции для режима одного OSD:

src/disk_tool/disk_tool.cpp

@@ -48,8 +48,6 @@ static const char *help_text =
     "    --max_other 10%\n"
     "      Use disks for OSD data even if they already have non-Vitastor partitions,\n"
     "      but only if these take up no more than this percent of disk space.\n"
-    "    --dry-run\n"
-    "      Check and print new OSD count for each disk but do not actually create them.\n"
     "  \n"
     "  Options (single-device mode):\n"
     "    --data_device <DEV>        Use partition <DEV> for data\n"

src/disk_tool/disk_tool.h

@@ -134,8 +134,7 @@ struct disk_tool_t
     int prepare(std::vector<std::string> devices);
     std::vector<vitastor_dev_info_t> collect_devices(const std::vector<std::string> & devices);
     json11::Json add_partitions(vitastor_dev_info_t & devinfo, std::vector<std::string> sizes);
-    std::vector<std::string> get_new_data_parts(vitastor_dev_info_t & dev,
-        uint64_t osd_per_disk, uint64_t max_other_percent, uint64_t *check_new_count);
+    std::vector<std::string> get_new_data_parts(vitastor_dev_info_t & dev, uint64_t osd_per_disk, uint64_t max_other_percent);
     int get_meta_partition(std::vector<vitastor_dev_info_t> & ssds, std::map<std::string, std::string> & options);
 
     int upgrade_simple_unit(std::string unit);

src/disk_tool/disk_tool_prepare.cpp

@@ -435,7 +435,7 @@ json11::Json disk_tool_t::add_partitions(vitastor_dev_info_t & devinfo, std::vec
 }
 
 std::vector<std::string> disk_tool_t::get_new_data_parts(vitastor_dev_info_t & dev,
-    uint64_t osd_per_disk, uint64_t max_other_percent, uint64_t *check_new_count)
+    uint64_t osd_per_disk, uint64_t max_other_percent)
 {
     std::vector<std::string> use_parts;
     uint64_t want_parts = 0;
@@ -484,11 +484,6 @@ std::vector<std::string> disk_tool_t::get_new_data_parts(vitastor_dev_info_t & d
         else
             want_parts = osd_per_disk-osds_exist;
     }
-    if (check_new_count)
-    {
-        *check_new_count = want_parts;
-        return use_parts;
-    }
     if (want_parts > 0)
     {
         // Disk is not partitioned yet - create OSD partition(s)
@@ -689,25 +684,10 @@ int disk_tool_t::prepare(std::vector<std::string> devices)
     }
     json11::Json::array all_results, errors;
     auto journal_size = options["journal_size"];
-    if (options.find("dry_run") != options.end())
-    {
-        json11::Json::array results;
-        for (auto & dev: devinfo)
-        {
-            uint64_t new_part_count = 0;
-            auto existing_part_count = get_new_data_parts(dev, osd_per_disk, max_other_percent, &new_part_count).size();
-            results.push_back(json11::Json::object{ { "device_path", dev.path }, { "new_osd_count", existing_part_count+new_part_count } });
-            if (!json && new_part_count+existing_part_count > 0)
-                printf("Will initialize %ju OSD(s) on %s\n", existing_part_count+new_part_count, dev.path.c_str());
-        }
-        if (json)
-            printf("%s\n", json11::Json(json11::Json::object{{ "devices", results }}).dump().c_str());
-        return 0;
-    }
     for (auto & dev: devinfo)
     {
         // Select new partitions and create an OSD on each of them
-        for (const auto & uuid: get_new_data_parts(dev, osd_per_disk, max_other_percent, NULL))
+        for (const auto & uuid: get_new_data_parts(dev, osd_per_disk, max_other_percent))
         {
             options["force"] = true;
             options["data_device"] = "/dev/disk/by-partuuid/"+strtolower(uuid);