sbcli-dev 10.6.7__tar.gz → 10.6.8__tar.gz

{sbcli_dev-10.6.7 → sbcli_dev-10.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-dev
-Version: 10.6.7
+Version: 10.6.8
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-10.6.7 → sbcli_dev-10.6.8}/sbcli_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-dev
-Version: 10.6.7
+Version: 10.6.8
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-10.6.7 → sbcli_dev-10.6.8}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=10.6.7
+SIMPLY_BLOCK_VERSION=10.6.8
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 DOCKER_USER=hamdysimplyblock

{sbcli_dev-10.6.7 → sbcli_dev-10.6.8}/simplyblock_core/storage_node_ops.py

@@ -869,14 +869,14 @@ def _connect_to_remote_jm_devs(this_node, jm_ids=[]):
                     remote_devices.append(jm_dev)
         elif len(this_node.remote_jm_devices) > 0:
             remote_devices = this_node.remote_jm_devices
-
-        for node in db_controller.get_storage_nodes_by_cluster_id(this_node.cluster_id):
-            if node.get_id() == this_node.get_id() or node.is_secondary_node:
-                continue
-            if node.jm_device and node.jm_device.status == JMDevice.STATUS_ONLINE:
-                remote_devices.append(node.jm_device)
-                if len(remote_devices) >= 3 :
-                    break
+        else:
+            for node in db_controller.get_storage_nodes_by_cluster_id(this_node.cluster_id):
+                if node.get_id() == this_node.get_id() or node.is_secondary_node:
+                    continue
+                if node.jm_device and node.jm_device.status == JMDevice.STATUS_ONLINE:
+                    remote_devices.append(node.jm_device)
+                    if len(remote_devices) >= 3 :
+                        break
 
     new_devs = []
     for jm_dev in remote_devices:
@@ -891,7 +891,7 @@ def _connect_to_remote_jm_devs(this_node, jm_ids=[]):
                 org_dev_node = node
                 break
 
-        if not org_dev:
+        if not org_dev or org_dev in new_devs:
             continue
 
         name = f"remote_{org_dev.jm_bdev}"

{sbcli_dev-10.6.7 → sbcli_dev-10.6.8}/simplyblock_web/blueprints/snode_ops.py

@@ -417,6 +417,9 @@ def delete_gpt_partitions_for_dev():
     cmd_list = [
         f"echo -n \"{device_pci}\" > /sys/bus/pci/drivers/uio_pci_generic/unbind",
         f"echo -n \"{device_pci}\" > /sys/bus/pci/drivers/nvme/bind",
+        f"echo \"nvme\" > /sys/bus/pci/devices/{device_pci}/driver_override",
+        f"echo -n \"{device_pci}\" > /sys/bus/pci/drivers/nvme/bind",
+
     ]
 
     for cmd in cmd_list:
@@ -426,23 +429,6 @@ def delete_gpt_partitions_for_dev():
         time.sleep(1)
 
     device_name = os.popen(f"ls /sys/devices/pci0000:00/{device_pci}/nvme/nvme*/ | grep nvme").read().strip()
-
-    if not device_name:
-        cmd_list = [
-            f"echo -n \"{device_pci}\" > /sys/bus/pci/drivers/uio_pci_generic/unbind",
-            f"echo -n \"{device_pci}\" > /sys/bus/pci/drivers/nvme/bind",
-            f"echo -n \"{device_pci}\" > /sys/bus/pci/drivers/nvme/bind",
-            f"echo -n \"{device_pci}\" > /sys/bus/pci/drivers/nvme/bind",
-        ]
-
-        for cmd in cmd_list:
-            logger.debug(cmd)
-            ret = os.popen(cmd).read().strip()
-            logger.debug(ret)
-            time.sleep(3)
-
-    device_name = os.popen(f"ls /sys/devices/pci0000:00/{device_pci}/nvme/nvme*/ | grep nvme").read().strip()
-
     if device_name:
         cmd_list = [
             f"parted -fs /dev/{device_name} mklabel gpt",
@@ -453,7 +439,7 @@ def delete_gpt_partitions_for_dev():
             logger.debug(cmd)
             ret = os.popen(cmd).read().strip()
             logger.debug(ret)
-            time.sleep(3)
+            time.sleep(1)
 
     return utils.get_response(True)