sbcli-dev 6.2.6__tar.gz → 6.2.7__tar.gz

{sbcli_dev-6.2.6 → sbcli_dev-6.2.7}/PKG-INFO

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

{sbcli_dev-6.2.6 → sbcli_dev-6.2.7}/env_var

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

{sbcli_dev-6.2.6 → sbcli_dev-6.2.7}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-6.2.6 → sbcli_dev-6.2.7}/simplyblock_core/controllers/lvol_controller.py

@@ -1097,6 +1097,8 @@ def connect_lvol(uuid):
                 "ip": ip,
                 "port": port,
                 "nqn": lvol.nqn,
+                "reconnect-delay": constants.LVOL_NVME_CONNECT_RECONNECT_DELAY,
+                "ctrl-loss-tmo": constants.LVOL_NVME_CONNECT_CTRL_LOSS_TMO,
                 "connect": f"sudo nvme connect --reconnect-delay={constants.LVOL_NVME_CONNECT_RECONNECT_DELAY} "
                            f"--ctrl-loss-tmo={constants.LVOL_NVME_CONNECT_CTRL_LOSS_TMO} --transport={transport} "
                            f"--traddr={ip} --trsvcid={port} --nqn={lvol.nqn}",

{sbcli_dev-6.2.6 → sbcli_dev-6.2.7}/simplyblock_core/services/storage_node_monitor.py

@@ -279,7 +279,7 @@ while True:
 
                 if ping_check and node_api_check and (not spdk_process or not node_rpc_check):
                     # add node to auto restart
-                    if cluster.status == Cluster.STATUS_ACTIVE:
+                    if cluster.status in [Cluster.STATUS_ACTIVE, Cluster.STATUS_DEGRADED, Cluster.STATUS_SUSPENDED]:
                         tasks_controller.add_node_to_auto_restart(snode)
 
         update_cluster_status(cluster_id)

{sbcli_dev-6.2.6 → sbcli_dev-6.2.7}/simplyblock_core/services/storage_node_self_lock.py

@@ -1,41 +1,46 @@
 # coding=utf-8
+import json
+import os
 import time
 
-import fdb
-
-from simplyblock_core import constants, utils
+from simplyblock_core import utils
 from simplyblock_core.snode_client import SNodeClient
 
 logger = utils.get_logger(__name__)
 
 logger.info("Starting node monitor")
+
+snode_api = SNodeClient("0.0.0.0:5000")
 MAX_RETRY = 6
 retry = MAX_RETRY
-error_open = False
-snode_api = SNodeClient("0.0.0.0:5000")
-
+db_available = True
 
 while True:
 
-    is_up, _ = snode_api.spdk_process_is_up()
+    try:
+        is_up, _ = snode_api.spdk_process_is_up()
+    except:
+        is_up = False
+
     if is_up:
-        if error_open is True and retry <= 0:
+        if db_available is False and retry <= 0:
             snode_api.spdk_process_kill()
-            error_open = False
             retry = MAX_RETRY
+
         else:
             try:
-                fdb.api_version(constants.KVD_DB_VERSION)
-                db = fdb.open(constants.KVD_DB_FILE_PATH)
-                db.options.set_transaction_timeout(5)
-                d =  db.get_range_startswith(b"/",  limit=1)
-                logger.info("Open db ok")
-                error_open = False
-                retry = MAX_RETRY
+                data = os.popen("fdbcli --exec \"status json\"").read().strip()
+                data = json.loads(data)
+                db_available = data["client"]['database_status']['available']
             except Exception as e:
                 logger.error(e)
+                db_available = False
+
+            if db_available:
+                logger.info("Open db ok")
+                retry = MAX_RETRY
+            else:
                 logger.info("Open db error")
-                error_open = True
                 retry -= 1
 
     time.sleep(10)

{sbcli_dev-6.2.6 → sbcli_dev-6.2.7}/simplyblock_web/blueprints/snode_ops.py

@@ -217,7 +217,6 @@ def spdk_process_start():
 def spdk_process_kill():
     node_docker = get_docker_client()
     for cont in node_docker.containers.list(all=True):
-        logger.debug(cont.attrs)
         if cont.attrs['Name'] == "/spdk" or cont.attrs['Name'] == "/spdk_proxy":
             cont.stop(timeout=5)
             cont.remove(force=True)
@@ -228,7 +227,6 @@ def spdk_process_kill():
 def spdk_process_is_up():
     node_docker = get_docker_client()
     for cont in node_docker.containers.list(all=True):
-        logger.debug(cont.attrs)
         if cont.attrs['Name'] == "/spdk":
             status = cont.attrs['State']["Status"]
             is_running = cont.attrs['State']["Running"]