sbcli-dev 6.2.8__tar.gz → 6.2.9__tar.gz

{sbcli_dev-6.2.8 → sbcli_dev-6.2.9}/PKG-INFO

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

{sbcli_dev-6.2.8 → sbcli_dev-6.2.9}/env_var

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

{sbcli_dev-6.2.8 → sbcli_dev-6.2.9}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-6.2.8 → sbcli_dev-6.2.9}/sbcli_dev.egg-info/SOURCES.txt

@@ -106,7 +106,6 @@ simplyblock_core/services/remove_service.sh
 simplyblock_core/services/service_template.service
 simplyblock_core/services/spdk_http_proxy_server.py
 simplyblock_core/services/storage_node_monitor.py
-simplyblock_core/services/storage_node_self_lock.py
 simplyblock_core/services/tasks_runner_failed_migration.py
 simplyblock_core/services/tasks_runner_migration.py
 simplyblock_core/services/tasks_runner_new_dev_migration.py

{sbcli_dev-6.2.8 → sbcli_dev-6.2.9}/simplyblock_core/scripts/docker-compose-swarm.yml

@@ -289,20 +289,6 @@ services:
     environment:
       SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
-  StorageNodeSelfLock:
-    image: $SIMPLYBLOCK_DOCKER_IMAGE
-    command: "python simplyblock_core/services/storage_node_self_lock.py"
-    deploy:
-      mode: global
-      placement:
-        constraints: [node.role == worker]
-    volumes:
-      - "/etc/foundationdb:/etc/foundationdb"
-    networks:
-      - hostnet
-    environment:
-      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
-
 
 volumes:
   os_data:

{sbcli_dev-6.2.8 → sbcli_dev-6.2.9}/simplyblock_core/services/main_distr_event_collector.py

@@ -67,9 +67,7 @@ def process_device_event(event):
         # else:
         logger.info(f"Setting device to unavailable")
         device_controller.device_set_unavailable(device_obj.get_id())
-
-        if device_node_obj.get_id() == event_node_obj.get_id():
-            device_controller.device_set_io_error(device_obj.get_id(), True)
+        device_controller.device_set_io_error(device_obj.get_id(), True)
 
         event.status = 'processed'
 

sbcli_dev-6.2.8/simplyblock_core/services/storage_node_self_lock.py

@@ -1,46 +0,0 @@
-# coding=utf-8
-import json
-import os
-import time
-
-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
-db_available = True
-
-while True:
-
-    try:
-        is_up, _ = snode_api.spdk_process_is_up()
-    except:
-        is_up = False
-
-    if is_up:
-        if db_available is False and retry <= 0:
-            snode_api.spdk_process_kill()
-            retry = MAX_RETRY
-
-        else:
-            try:
-                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")
-                retry -= 1
-
-    time.sleep(10)