sbcli-dev 4.0.33__zip → 4.0.35__zip

{sbcli_dev-4.0.33 → sbcli_dev-4.0.35}/PKG-INFO

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

{sbcli_dev-4.0.33 → sbcli_dev-4.0.35}/env_var

@@ -1,5 +1,6 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=4.0.33
+SIMPLY_BLOCK_VERSION=4.0.35
+
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main-dev

{sbcli_dev-4.0.33 → sbcli_dev-4.0.35}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.33 → sbcli_dev-4.0.35}/simplyblock_core/constants.py

@@ -52,7 +52,7 @@ GRAYLOG_CHECK_INTERVAL_SEC = 60
 
 FDB_CHECK_INTERVAL_SEC = 60
 
-SIMPLY_BLOCK_DOCKER_IMAGE = "simplyblock/simplyblock:main"
+SIMPLY_BLOCK_DOCKER_IMAGE = "simplyblock/simplyblock:main-delay"
 SIMPLY_BLOCK_CLI_NAME = "sbcli-dev"
 TASK_EXEC_INTERVAL_SEC = 30
 TASK_EXEC_RETRY_COUNT = 8

{sbcli_dev-4.0.33 → sbcli_dev-4.0.35}/simplyblock_core/storage_node_ops.py

@@ -878,6 +878,11 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     #         return False
 
     cloud_instance = node_info['cloud_instance']
+    if not cloud_instance:
+        # Create a static cloud instance from node info
+        cloud_instance = {"id": node_info['system_id'], "type": "None", "cloud": "None",
+                          "ip": node_info['network_interface'][iface_name]["ip"],
+                          "public_ip": node_info['network_interface'][iface_name]["ip"]}
     """"
      "cloud_instance": {
           "id": "565979732541",
@@ -1721,6 +1726,9 @@ def restart_storage_node(
     logger.info("Setting node status to Online")
     set_node_status(node_id, StorageNode.STATUS_ONLINE)
 
+
+    time.sleep(5)
+
     # make other nodes connect to the new devices
     logger.info("Make other nodes connect to the node devices")
     snodes = db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id)
@@ -1743,6 +1751,8 @@ def restart_storage_node(
             continue
         tasks_controller.add_device_mig_task(dev.get_id())
 
+    time.sleep(5)
+
     if cluster.status != cluster.STATUS_ACTIVE:
         logger.warning(f"The cluster status is not active ({cluster.status}), adding the node without distribs and lvstore")
         logger.info("Done")
@@ -2588,9 +2598,9 @@ def recreate_lvstore(snode):
     temp_rpc_client = RPCClient(
             snode.mgmt_ip, snode.rpc_port,
             snode.rpc_username, snode.rpc_password)
-    time.sleep(1)
+    time.sleep(5)
     ret = temp_rpc_client.bdev_examine(snode.raid)
-    time.sleep(1)
+    time.sleep(5)
     ret = temp_rpc_client.bdev_wait_for_examine()
     time.sleep(1)
 
@@ -2762,6 +2772,7 @@ def _create_bdev_stack(snode, lvstore_stack=None):
             distribs_list = bdev["distribs_list"]
             strip_size_kb = params["strip_size_kb"]
             ret = rpc_client.bdev_raid_create(name, distribs_list, strip_size_kb=strip_size_kb)
+            time.sleep(5)
 
         else:
             logger.debug(f"Unknown BDev type: {type}")

{sbcli_dev-4.0.33 → sbcli_dev-4.0.35}/simplyblock_web/node_utils.py

@@ -23,6 +23,9 @@ def run_command(cmd):
 def _get_spdk_pcie_list():  # return: ['0000:00:1e.0', '0000:00:1f.0']
     out, err, _ = run_command("ls /sys/bus/pci/drivers/uio_pci_generic")
     spdk_pcie_list = [line for line in out.split() if line.startswith("0000")]
+    if not spdk_pcie_list:
+        out, err, _ = run_command("ls /sys/bus/pci/drivers/vfio-pci")
+        spdk_pcie_list = [line for line in out.split() if line.startswith("0000")]
     logger.debug(spdk_pcie_list)
     return spdk_pcie_list