sbcli-pre 1.0.6__zip → 1.0.8__zip

{sbcli_pre-1.0.6 → sbcli_pre-1.0.8}/PKG-INFO

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

{sbcli_pre-1.0.6 → sbcli_pre-1.0.8}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=1.0.6
+SIMPLY_BLOCK_VERSION=1.0.8
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:pre-release
 

{sbcli_pre-1.0.6 → sbcli_pre-1.0.8}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.0.6 → sbcli_pre-1.0.8}/simplyblock_core/controllers/device_controller.py

@@ -144,7 +144,7 @@ def _def_create_device_stack(device_obj, snode):
     logger.info(f"Adding {pt_name} to the subsystem")
     ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
 
-    if device_obj.jm_bdev:
+    if hasattr(device_obj, 'jm_bdev') and device_obj.jm_bdev:
         ret = rpc_client.bdev_jm_create(device_obj.jm_bdev, device_obj.alceml_bdev)
         if not ret:
             logger.error(f"Failed to create jm bdev: {device_obj.jm_bdev}")
@@ -190,11 +190,6 @@ def restart_device(device_id, force=False):
         logger.error("Failed to create device stack")
         return False
 
-    logger.info("Setting device io_error to False")
-    device_set_io_error(device_id, False)
-    logger.info("Setting device online")
-    device_set_online(device_id)
-
     logger.info("Make other nodes connect to the device")
     snodes = db_controller.get_storage_nodes()
     for node_index, node in enumerate(snodes):
@@ -224,6 +219,10 @@ def restart_device(device_id, force=False):
         node.write_to_db(db_controller.kv_store)
         time.sleep(3)
 
+    logger.info("Setting device io_error to False")
+    device_set_io_error(device_id, False)
+    logger.info("Setting device online")
+    device_set_online(device_id)
     device_events.device_restarted(device_obj)
     return "Done"
 

{sbcli_pre-1.0.6 → sbcli_pre-1.0.8}/simplyblock_core/controllers/health_controller.py

@@ -55,7 +55,7 @@ def check_cluster(cluster_id):
 
 def _check_node_docker_api(ip):
     try:
-        node_docker = docker.DockerClient(base_url=f"tcp://{ip}:2375", version="auto")
+        node_docker = docker.DockerClient(base_url=f"tcp://{ip}:2375", version="auto", timeout=3)
         ret = node_docker.info()
         if ret:
             logger.debug(ret)
@@ -69,7 +69,7 @@ def _check_node_rpc(rpc_ip, rpc_port, rpc_username, rpc_password):
     try:
         rpc_client = RPCClient(
             rpc_ip, rpc_port, rpc_username, rpc_password,
-            timeout=5, retry=3)
+            timeout=3, retry=1)
         ret = rpc_client.get_version()
         if ret:
             logger.debug(f"SPDK version: {ret['version']}")

{sbcli_pre-1.0.6 → sbcli_pre-1.0.8}/simplyblock_core/controllers/tasks_controller.py

@@ -34,7 +34,7 @@ def _add_task(function_name, cluster_id, node_id, device_id):
     task_obj.node_id = node_id
     task_obj.device_id = device_id
     task_obj.date = int(time.time())
-    task_obj.function_name = JobSchedule.FN_DEV_MIG
+    task_obj.function_name = function_name
     task_obj.status = JobSchedule.STATUS_NEW
     task_obj.write_to_db(db_controller.kv_store)
     tasks_events.task_create(task_obj)

{sbcli_pre-1.0.6 → sbcli_pre-1.0.8}/simplyblock_core/storage_node_ops.py

@@ -2005,7 +2005,7 @@ def set_node_status(node_id, status):
         snode.updated_at = str(datetime.datetime.now())
         snode.write_to_db(db_controller.kv_store)
         storage_events.snode_status_change(snode, snode.status, old_status, caused_by="monitor")
-        distr_controller.send_node_status_event(snode.get_id(), status)
+        distr_controller.send_node_status_event(snode, status)
 
     if snode.status == StorageNode.STATUS_ONLINE:
         logger.info("Connecting to remote devices")