sbcli-dev 3.9.6__zip → 3.9.8__zip

{sbcli_dev-3.9.6 → sbcli_dev-3.9.8}/PKG-INFO

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

{sbcli_dev-3.9.6 → sbcli_dev-3.9.8}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=3.9.6
+SIMPLY_BLOCK_VERSION=3.9.8
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main

{sbcli_dev-3.9.6 → sbcli_dev-3.9.8}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.9.6 → sbcli_dev-3.9.8}/simplyblock_core/controllers/device_controller.py

@@ -621,39 +621,6 @@ def add_device(device_id):
 
     logger.info(f"Adding device {device_id}")
 
-
-
-    #######################################
-
-    rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
-
-    # look for partitions
-    partitioned_devices = storage_node_ops._search_for_partitions(rpc_client, device_obj)
-    logger.debug("partitioned_devices")
-    logger.debug(partitioned_devices)
-
-    if len(partitioned_devices) == 2:
-        logger.info("Partitioned devices found")
-    else:
-        logger.info(f"Creating partitions for {device_obj.nvme_bdev}")
-        storage_node_ops._create_device_partitions(rpc_client, device_obj, snode)
-        partitioned_devices = storage_node_ops._search_for_partitions(rpc_client, device_obj)
-
-        if len(partitioned_devices) == 2:
-            logger.info("Device partitions created")
-        else:
-            logger.error("Failed to create partitions")
-            return False
-
-    jm_part = partitioned_devices[0]
-    device_part = partitioned_devices[1]
-
-    device_obj.device_name = device_part.device_name
-    device_obj.nvme_bdev = device_part.nvme_bdev
-    device_obj.size = device_part.size
-
-    #######################################
-
     ret = _def_create_device_stack(device_obj, snode)
     if not ret:
         logger.error("Failed to create device stack")

{sbcli_dev-3.9.6 → sbcli_dev-3.9.8}/simplyblock_core/controllers/tasks_controller.py

@@ -74,11 +74,13 @@ def add_device_mig_task(device_id):
 
 
 def add_device_to_auto_restart(device):
-    return _add_task(JobSchedule.FN_DEV_RESTART, device.cluster_id, device.node_id, device.get_id())
+    return True
+    # return _add_task(JobSchedule.FN_DEV_RESTART, device.cluster_id, device.node_id, device.get_id())
 
 
 def add_node_to_auto_restart(node):
-    return _add_task(JobSchedule.FN_NODE_RESTART, node.cluster_id, node.get_id(), "")
+    return True
+    # return _add_task(JobSchedule.FN_NODE_RESTART, node.cluster_id, node.get_id(), "")
 
 
 def list_tasks(cluster_id, is_json=False):

{sbcli_dev-3.9.6 → sbcli_dev-3.9.8}/simplyblock_core/rpc_client.py

@@ -546,8 +546,8 @@ class RPCClient:
             "bdev_retry_count": 0,
             "transport_retry_count": 0,
             "ctrlr_loss_timeout_sec": 2,
-            "fast_io_fail_timeout_sec": 1,
-            "reconnect_delay_sec": 1,
+            "fast_io_fail_timeout_sec": 5,
+            "reconnect_delay_sec": 5,
             "keep_alive_timeout_ms": 200,
             "transport_ack_timeout": 7,
             "timeout_us": 500000

{sbcli_dev-3.9.6 → sbcli_dev-3.9.8}/simplyblock_core/storage_node_ops.py

@@ -1631,9 +1631,11 @@ def restart_storage_node(
     devices_sn = [d.serial_number for d in nvme_devs]
     for db_dev in snode.nvme_devices:
         known_devices_sn.append(db_dev.serial_number)
+        if db_dev.status == NVMeDevice.STATUS_FAILED_AND_MIGRATED:
+            continue
         if db_dev.serial_number in devices_sn:
             logger.info(f"Device found: {db_dev.get_id()}, status {db_dev.status}")
-            if db_dev.status not in [NVMeDevice.STATUS_JM, NVMeDevice.STATUS_FAILED]:
+            if db_dev.status not in [NVMeDevice.STATUS_JM, NVMeDevice.STATUS_FAILED, NVMeDevice.STATUS_NEW]:
                 db_dev.status = NVMeDevice.STATUS_ONLINE
             active_devices.append(db_dev)
         else: