sbcli-pre 1.0.7__zip → 1.0.9__zip

{sbcli_pre-1.0.7 → sbcli_pre-1.0.9}/PKG-INFO

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

{sbcli_pre-1.0.7 → sbcli_pre-1.0.9}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=1.0.7
+SIMPLY_BLOCK_VERSION=1.0.9
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:pre-release
 

{sbcli_pre-1.0.7 → sbcli_pre-1.0.9}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.0.7 → sbcli_pre-1.0.9}/simplyblock_core/constants.py

@@ -58,6 +58,6 @@ TASK_EXEC_INTERVAL_SEC = 30
 TASK_EXEC_RETRY_COUNT = 8
 
 SIMPLY_BLOCK_SPDK_CORE_IMAGE = "simplyblock/spdk-core:latest"
-SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:faster-bdev-startup-latest"
+SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:prerelease-latest"
 
 GELF_PORT = 12201

{sbcli_pre-1.0.7 → sbcli_pre-1.0.9}/simplyblock_core/controllers/health_controller.py

@@ -55,7 +55,7 @@ def check_cluster(cluster_id):
 
 def _check_node_docker_api(ip):
     try:
-        node_docker = docker.DockerClient(base_url=f"tcp://{ip}:2375", version="auto")
+        node_docker = docker.DockerClient(base_url=f"tcp://{ip}:2375", version="auto", timeout=3)
         ret = node_docker.info()
         if ret:
             logger.debug(ret)
@@ -69,7 +69,7 @@ def _check_node_rpc(rpc_ip, rpc_port, rpc_username, rpc_password):
     try:
         rpc_client = RPCClient(
             rpc_ip, rpc_port, rpc_username, rpc_password,
-            timeout=5, retry=3)
+            timeout=3, retry=1)
         ret = rpc_client.get_version()
         if ret:
             logger.debug(f"SPDK version: {ret['version']}")

{sbcli_pre-1.0.7 → sbcli_pre-1.0.9}/simplyblock_core/services/distr_event_collector.py

@@ -144,8 +144,8 @@ while True:
     )
     num_of_events = constants.DISTR_EVENT_COLLECTOR_NUM_OF_EVENTS
     try:
-        events = client.distr_status_events_get()
-        # events = client.distr_status_events_discard_then_get(0, num_of_events)
+        # events = client.distr_status_events_get()
+        events = client.distr_status_events_discard_then_get(0, num_of_events)
         if not events:
             logger.error("Distr events empty")
             continue
@@ -161,8 +161,8 @@ while True:
             logger.info(f"Processing event: {eid}")
             process_event(eid)
 
-        # logger.info(f"Discarding events: {num_of_events}")
-        # events = client.distr_status_events_discard_then_get(num_of_events, 0)
+        logger.info(f"Discarding events: {num_of_events}")
+        events = client.distr_status_events_discard_then_get(num_of_events, 0)
 
     except Exception as e:
         logger.error("Failed to process distr events")

{sbcli_pre-1.0.7 → sbcli_pre-1.0.9}/simplyblock_core/storage_node_ops.py

@@ -2005,7 +2005,7 @@ def set_node_status(node_id, status):
         snode.updated_at = str(datetime.datetime.now())
         snode.write_to_db(db_controller.kv_store)
         storage_events.snode_status_change(snode, snode.status, old_status, caused_by="monitor")
-        distr_controller.send_node_status_event(snode.get_id(), status)
+        distr_controller.send_node_status_event(snode, status)
 
     if snode.status == StorageNode.STATUS_ONLINE:
         logger.info("Connecting to remote devices")