sbcli-dev 5.1.4__zip → 5.1.6__zip

{sbcli_dev-5.1.4 → sbcli_dev-5.1.6}/PKG-INFO

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

{sbcli_dev-5.1.4 → sbcli_dev-5.1.6}/env_var

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

{sbcli_dev-5.1.4 → sbcli_dev-5.1.6}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-5.1.4 → sbcli_dev-5.1.6}/simplyblock_core/controllers/health_controller.py

@@ -6,7 +6,7 @@ import docker
 
 from simplyblock_core import utils, distr_controller
 from simplyblock_core.kv_store import DBController
-from simplyblock_core.models.nvme_device import NVMeDevice
+from simplyblock_core.models.nvme_device import NVMeDevice, JMDevice
 from simplyblock_core.models.storage_node import StorageNode
 from simplyblock_core.rpc_client import RPCClient
 from simplyblock_core.snode_client import SNodeClient
@@ -444,6 +444,9 @@ def check_jm_device(device_id):
         logger.info(f"Skipping ,device status is {jm_device.status}")
         return True
 
+    if snode.primary_ip != snode.mgmt_ip and jm_device.status == JMDevice.STATUS_UNAVAILABLE:
+        return True
+
     passed = True
     try:
         rpc_client = RPCClient(

{sbcli_dev-5.1.4 → sbcli_dev-5.1.6}/simplyblock_core/controllers/snapshot_controller.py

@@ -236,6 +236,8 @@ def clone(snapshot_id, clone_name, new_size=0):
         logger.error(error)
         return False, f"Failed to add lvol on node {snode.get_id()}"
 
+    cluster = db_controller.get_cluster_by_id(snode.cluster_id)
+
     lvol = LVol()
     lvol.uuid = str(uuid.uuid4())
     lvol.lvol_name = clone_name
@@ -249,7 +251,7 @@ def clone(snapshot_id, clone_name, new_size=0):
     lvol.node_id = snode.get_id()
     lvol.mode = 'read-write'
     lvol.cloned_from_snap = snapshot_id
-    lvol.nqn = snode.subsystem + ":lvol:" + lvol.uuid
+    lvol.nqn = cluster.nqn + ":lvol:" + lvol.uuid
     lvol.pool_uuid = pool.id
     lvol.ha_type = snap.lvol.ha_type
     lvol.lvol_type = 'lvol'
@@ -258,7 +260,7 @@ def clone(snapshot_id, clone_name, new_size=0):
     lvol.distr_bs = snap.lvol.distr_bs
     lvol.distr_chunk_bs = snap.lvol.distr_chunk_bs
     lvol.distr_page_size = snap.lvol.distr_page_size
-    lvol.guid = snap.lvol.guid
+    lvol.guid = lvol_controller._generate_hex_string(16)
     lvol.vuid = snap.lvol.vuid
 
     lvol.status = LVol.STATUS_ONLINE
@@ -307,7 +309,6 @@ def clone(snapshot_id, clone_name, new_size=0):
     logger.info("creating subsystem %s", subsystem_nqn)
     ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', lvol.uuid)
 
-    cluster = db_controller.get_cluster_by_id(snode.cluster_id)
     # add listeners
     logger.info("adding listeners")
     for iface in snode.data_nics:

{sbcli_dev-5.1.4 → sbcli_dev-5.1.6}/simplyblock_core/controllers/tasks_controller.py

@@ -235,3 +235,11 @@ def get_new_device_mig_task_for_device(cluster_id):
                 return task.uuid
     return False
 
+
+def get_failed_device_mig_task(cluster_id, device_id):
+    tasks = db_controller.get_job_tasks(cluster_id)
+    for task in tasks:
+        if task.function_name == JobSchedule.FN_FAILED_DEV_MIG and task.device_id == device_id:
+            if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
+                return task.uuid
+    return False