sbcli-pre 25.3.13__tar.gz → 25.3.15__tar.gz

{sbcli-pre-25.3.13 → sbcli-pre-25.3.15}/PKG-INFO

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

{sbcli-pre-25.3.13 → sbcli-pre-25.3.15}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli-pre-25.3.13 → sbcli-pre-25.3.15}/setup.py

@@ -106,5 +106,5 @@ setup(
         '': ["/etc/simplyblock/requirements.txt"],
         '/etc/simplyblock': ["requirements.txt"]
     },
-    cmdclass={'install': install},
+    # cmdclass={'install': install},
 )

{sbcli-pre-25.3.13 → sbcli-pre-25.3.15}/simplyblock_core/cluster_ops.py

@@ -640,6 +640,27 @@ def cluster_activate(cl_id, force=False, force_lvstore_create=False):
                 set_cluster_status(cl_id, ols_status)
                 return False
 
+    for snode in snodes:
+        if not snode.is_secondary_node:
+            continue
+        if snode.status != StorageNode.STATUS_ONLINE:
+            continue
+
+        logger.info(f"Activating sec node: {snode.get_id()}")
+        ret = storage_node_ops.recreate_lvstore_on_sec(snode)
+        snode = db_controller.get_storage_node_by_id(snode.get_id())
+        if ret:
+            snode.lvstore_status = "ready"
+            snode.write_to_db()
+
+        else:
+            snode.lvstore_status = "failed"
+            snode.write_to_db()
+            logger.error(f"Failed to activate node {snode.get_id()}")
+            if not force:
+                logger.error("Failed to activate cluster")
+                # set_cluster_status(cl_id, ols_status)
+                # return False
 
     if not cluster.cluster_max_size:
         cluster = db_controller.get_cluster_by_id(cl_id)
@@ -1234,12 +1255,13 @@ def update_cluster(cluster_id, mgmt_only=False, restart=False, spdk_image=None,
         logger.info(f"Pulling image {constants.SIMPLY_BLOCK_DOCKER_IMAGE}")
         cluster_docker.images.pull(constants.SIMPLY_BLOCK_DOCKER_IMAGE)
         image_without_tag = constants.SIMPLY_BLOCK_DOCKER_IMAGE.split(":")[0]
-        image_without_tag = image_without_tag.split("/")[-1]
+        image_without_tag = image_without_tag.split("/")
+        image_parts = "/".join(image_without_tag[-2:])
         service_image = constants.SIMPLY_BLOCK_DOCKER_IMAGE
         if mgmt_image:
             service_image = mgmt_image
         for service in cluster_docker.services.list():
-            if image_without_tag in service.attrs['Spec']['Labels']['com.docker.stack.image']:
+            if image_parts in service.attrs['Spec']['Labels']['com.docker.stack.image']:
                 logger.info(f"Updating service {service.name}")
                 service.update(image=service_image, force_update=True)
         logger.info("Done updating mgmt cluster")

{sbcli-pre-25.3.13 → sbcli-pre-25.3.15}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=25.3.13
+SIMPLY_BLOCK_VERSION=25.3.15
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:R25.3-PRE-Hotfix
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:R25.3-PRE-latest

{sbcli-pre-25.3.13 → sbcli-pre-25.3.15}/simplyblock_core/scripts/dashboards/cluster.json

@@ -2306,7 +2306,7 @@
             "type": "timeseries"
         }
     ],
-    "refresh": "",
+    "refresh": "5s",
     "schemaVersion": 38,
     "style": "dark",
     "tags": [],
@@ -2334,7 +2334,7 @@
                     "query": "query_result((cluster_read_io{cluster=~\".*\"}  and on() (absent(_{_=\"admin\"}) and absent(_{_=\"${__user.login}\"}))) or on() (cluster_read_io{cluster=\"${__user.login}\"}  unless on() (absent(_{_!=\"admin\"}) and absent(_{_=\"${user.login}\"}))))",
                     "refId": "PrometheusVariableQueryEditor-VariableQuery"
                 },
-                "refresh": 2,
+                "refresh": 1,
                 "regex": "/.*cluster=\"([^\"]*).*/",
                 "skipUrlSync": false,
                 "sort": 1,
@@ -2353,4 +2353,4 @@
     "uid": "d56e0ae7-48d5-481d-a2ea-3192da4d9e39",
     "version": 5,
     "weekStart": ""
-}
+}

{sbcli-pre-25.3.13 → sbcli-pre-25.3.15}/simplyblock_core/scripts/dashboards/devices.json

@@ -2325,7 +2325,7 @@
             "type": "timeseries"
         }
     ],
-    "refresh": "",
+    "refresh": "5s",
     "schemaVersion": 38,
     "style": "dark",
     "tags": [],
@@ -2353,7 +2353,7 @@
                     "query": "query_result((cluster_read_io{cluster=~\".*\"}  and on() (absent(_{_=\"admin\"}) and absent(_{_=\"${__user.login}\"}))) or on() (cluster_read_io{cluster=\"${__user.login}\"}  unless on() (absent(_{_!=\"admin\"}) and absent(_{_=\"${user.login}\"}))))",
                     "refId": "PrometheusVariableQueryEditor-VariableQuery"
                 },
-                "refresh": 2,
+                "refresh": 1,
                 "regex": "/.*cluster=\"([^\"]*).*/",
                 "skipUrlSync": false,
                 "sort": 1,

{sbcli-pre-25.3.13 → sbcli-pre-25.3.15}/simplyblock_core/scripts/dashboards/lvols.json

@@ -2429,7 +2429,7 @@
             "type": "timeseries"
         }
     ],
-    "refresh": "",
+    "refresh": "5s",
     "schemaVersion": 38,
     "style": "dark",
     "tags": [],
@@ -2457,7 +2457,7 @@
                     "query": "query_result((cluster_read_io{cluster=~\".*\"}  and on() (absent(_{_=\"admin\"}) and absent(_{_=\"${__user.login}\"}))) or on() (cluster_read_io{cluster=\"${__user.login}\"}  unless on() (absent(_{_!=\"admin\"}) and absent(_{_=\"${user.login}\"}))))",
                     "refId": "PrometheusVariableQueryEditor-VariableQuery"
                 },
-                "refresh": 2,
+                "refresh": 1,
                 "regex": "/.*cluster=\"([^\"]*).*/",
                 "skipUrlSync": false,
                 "sort": 1,

{sbcli-pre-25.3.13 → sbcli-pre-25.3.15}/simplyblock_core/scripts/dashboards/nodes.json

@@ -2679,7 +2679,7 @@
                     "query": "query_result((cluster_read_io{cluster=~\".*\"}  and on() (absent(_{_=\"admin\"}) and absent(_{_=\"${__user.login}\"}))) or on() (cluster_read_io{cluster=\"${__user.login}\"}  unless on() (absent(_{_!=\"admin\"}) and absent(_{_=\"${user.login}\"}))))",
                     "refId": "PrometheusVariableQueryEditor-VariableQuery"
                 },
-                "refresh": 2,
+                "refresh": 1,
                 "regex": "/.*cluster=\"([^\"]*).*/",
                 "skipUrlSync": false,
                 "sort": 1,
@@ -2711,7 +2711,7 @@
                     "query": "query_result(device_size_total{cluster=~\"$cluster\"})",
                     "refId": "PrometheusVariableQueryEditor-VariableQuery"
                 },
-                "refresh": 2,
+                "refresh": 1,
                 "regex": ".*snode=\"(.*?)\".*",
                 "skipUrlSync": false,
                 "sort": 1,

{sbcli-pre-25.3.13 → sbcli-pre-25.3.15}/simplyblock_core/scripts/dashboards/pools.json

@@ -2322,7 +2322,7 @@
             "type": "timeseries"
         }
     ],
-    "refresh": "",
+    "refresh": "5s",
     "schemaVersion": 38,
     "style": "dark",
     "tags": [],
@@ -2350,7 +2350,7 @@
                     "query": "query_result((cluster_read_io{cluster=~\".*\"}  and on() (absent(_{_=\"admin\"}) and absent(_{_=\"${__user.login}\"}))) or on() (cluster_read_io{cluster=\"${__user.login}\"}  unless on() (absent(_{_!=\"admin\"}) and absent(_{_=\"${user.login}\"}))))",
                     "refId": "PrometheusVariableQueryEditor-VariableQuery"
                 },
-                "refresh": 2,
+                "refresh": 1,
                 "regex": "/.*cluster=\"([^\"]*).*/",
                 "skipUrlSync": false,
                 "sort": 1,