sbcli-dev 10.3.6__tar.gz → 10.3.8__tar.gz

{sbcli_dev-10.3.6 → sbcli_dev-10.3.8}/PKG-INFO

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

{sbcli_dev-10.3.6 → sbcli_dev-10.3.8}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.3.6 → sbcli_dev-10.3.8}/simplyblock_core/controllers/health_controller.py

@@ -396,6 +396,9 @@ def check_lvol_on_node(lvol_id, node_id):
         return False
 
     snode = db_controller.get_storage_node_by_id(node_id)
+    if not snode:
+        return False
+
     rpc_client = RPCClient(
         snode.mgmt_ip, snode.rpc_port,
         snode.rpc_username, snode.rpc_password, timeout=5, retry=1)
@@ -443,7 +446,7 @@ def check_lvol(lvol_id):
         passed = True
         for nodes_id in lvol.nodes:
             node = db_controller.get_storage_node_by_id(nodes_id)
-            if node.status == StorageNode.STATUS_ONLINE:
+            if node and node.status == StorageNode.STATUS_ONLINE:
                 ret = check_lvol_on_node(lvol_id, nodes_id)
                 if not ret:
                     passed = False

{sbcli_dev-10.3.6 → sbcli_dev-10.3.8}/simplyblock_core/controllers/lvol_controller.py

@@ -175,6 +175,8 @@ def _get_next_3_nodes(cluster_id, lvol_size=0):
             continue
 
         if node.status == node.STATUS_ONLINE:
+            if node.hostname == "ip-10-245-16-169":
+                continue
             # Validate Eligible nodes for adding lvol
             # snode_api = SNodeClient(node.api_endpoint)
             # result, _ = snode_api.info()
@@ -319,6 +321,18 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
     if cl.status not in [cl.STATUS_ACTIVE, cl.STATUS_DEGRADED]:
         return False, f"Cluster is not active, status: {cl.status}"
 
+    if uid:
+        for lvol in db_controller.get_lvols():
+            if lvol.get_id() == uid:
+                if pvc_name:
+                    lvol.pvc_name = pvc_name
+                if name:
+                    lvol.lvol_name = name
+                if namespace:
+                    lvol.namespace = namespace
+                lvol.write_to_db()
+                return uid, None
+
     if ha_type == "default":
         ha_type = cl.ha_type
 

{sbcli_dev-10.3.6 → sbcli_dev-10.3.8}/simplyblock_core/env_var

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

{sbcli_dev-10.3.6 → sbcli_dev-10.3.8}/simplyblock_core/services/storage_node_monitor.py

@@ -62,7 +62,7 @@ def get_next_cluster_status(cluster_id):
             else:
                 node_offline_devices += 1
 
-        if node_offline_devices > 0 or node_online_devices == 0:
+        if node_offline_devices > 0 or (node_online_devices == 0 and node.status != StorageNode.STATUS_REMOVED):
             affected_nodes += 1
 
         online_devices += node_online_devices