sbcli-dev 19.2.0__tar.gz → 19.2.1__tar.gz

{sbcli_dev-19.2.0 → sbcli_dev-19.2.1}/PKG-INFO

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

{sbcli_dev-19.2.0 → sbcli_dev-19.2.1}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-19.2.0 → sbcli_dev-19.2.1}/simplyblock_core/env_var

@@ -1,5 +1,7 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=19.2.0
+SIMPLY_BLOCK_VERSION=19.2.1
+
+
+SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:multi_sn_k8s_worker
 
-SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:main-latest

{sbcli_dev-19.2.0 → sbcli_dev-19.2.1}/simplyblock_core/storage_node_ops.py

@@ -3047,8 +3047,9 @@ def recreate_lvstore(snode, force=False):
         passed = health_controller.check_bdev(bdev_name, bdev_names=node_bdev_names)
         if not passed:
             logger.error(f"Failed to recover BDev: {bdev_name} on node: {snode.get_id()}")
-            _kill_app()
-            raise Exception("Failed to recover lvstore")
+            if not force:
+                _kill_app()
+                raise Exception("Failed to recover lvstore")
 
     logger.info("Suspending JC compression")
     ret = rpc_client.jc_suspend_compression(jm_vuid=snode.jm_vuid, suspend=True)

{sbcli_dev-19.2.0 → sbcli_dev-19.2.1}/simplyblock_web/blueprints/snode_ops_k8s.py

@@ -18,7 +18,7 @@ from pydantic import BaseModel, Field
 from . import snode_ops
 from simplyblock_core import constants, shell_utils, utils as core_utils
 from simplyblock_web import utils, node_utils, node_utils_k8s
-from simplyblock_web.node_utils_k8s import deployment_name, namespace_id_file, pod_name
+from simplyblock_web.node_utils_k8s import namespace_id_file
 
 logger = logging.getLogger(__name__)
 logger.setLevel(constants.LOG_LEVEL)
@@ -330,9 +330,10 @@ def spdk_process_start(body: SPDKParams):
 
     total_mem_mib = core_utils.convert_size(core_utils.parse_size(body.total_mem), 'MB') if body.total_mem else ""
 
-    if _is_pod_up():
-        logger.info("SPDK deployment found, removing...")
-        spdk_process_kill()
+    if _is_pod_up(body.rpc_port):
+        logger.info("SPDK pod found, removing...")
+        query = utils.RPCPortParams(rpc_port=body.rpc_port)
+        spdk_process_kill(query)
 
     node_prepration_job_name = "snode-spdk-job-"
     node_name = os.environ.get("HOSTNAME", "")
@@ -408,11 +409,12 @@ def spdk_process_start(body: SPDKParams):
         'type': 'boolean'
     })}}},
 })
-def spdk_process_kill():
+def spdk_process_kill(query: utils.RPCPortParams):
     k8s_core_v1 = core_utils.get_k8s_core_client()
     try:
         namespace = node_utils_k8s.get_namespace()
-        resp = k8s_core_v1.delete_namespaced_pod(deployment_name, namespace)
+        pod_name = f"snode-spdk-pod-{query.rpc_port}"
+        resp = k8s_core_v1.delete_namespaced_pod(pod_name, namespace)
         retries = 10
         while retries > 0:
             resp = k8s_core_v1.list_namespaced_pod(namespace)
@@ -434,8 +436,9 @@ def spdk_process_kill():
     return utils.get_response(True)
 
 
-def _is_pod_up():
+def _is_pod_up(rpc_port):
     k8s_core_v1 = node_utils_k8s.get_k8s_core_client()
+    pod_name = f"snode-spdk-pod-{rpc_port}"
     try:
         resp = k8s_core_v1.list_namespaced_pod(node_utils_k8s.get_namespace())
         for pod in resp.items:
@@ -455,8 +458,8 @@ def _is_pod_up():
         'type': 'boolean'
     })}}},
 })
-def spdk_process_is_up():
-    if _is_pod_up():
+def spdk_process_is_up(query: utils.RPCPortParams):
+    if _is_pod_up(query.rpc_port):
         return utils.get_response(True)
     else:
         return utils.get_response(False, "SPDK container is not running")
@@ -485,6 +488,7 @@ class _FirewallParams(BaseModel):
     port_id: int
     port_type: str
     action: str
+    rpc_port: int = Field(ge=1, le=65536)
 
 
 @api.post('/firewall_set_port', responses={
@@ -495,7 +499,6 @@ class _FirewallParams(BaseModel):
 def firewall_set_port(body: _FirewallParams):
     return utils.get_response(False, "deprecated bath post snode/firewall_set_port")
 
-
 @api.get('/get_firewall', responses={
     200: {'content': {'application/json': {'schema': utils.response_schema({
         'type': 'string'

{sbcli_dev-19.2.0 → sbcli_dev-19.2.1}/simplyblock_web/templates/storage_deploy_spdk.yaml.j2

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: snode-spdk-deployment-{{ HOSTNAME }}
+  name: snode-spdk-pod-{{ RPC_PORT }}
   namespace: {{ NAMESPACE }}
   labels:
-    app: spdk-app-{{ HOSTNAME }}
+    app: spdk-app-{{ RPC_PORT }}
     role: simplyblock-storage-node
 spec:
   restartPolicy: Never