sbcli-dev 14.0.76__tar.gz → 14.0.78__tar.gz

{sbcli_dev-14.0.76 → sbcli_dev-14.0.78}/PKG-INFO

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

{sbcli_dev-14.0.76 → sbcli_dev-14.0.78}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-14.0.76 → sbcli_dev-14.0.78}/simplyblock_core/cluster_ops.py

@@ -164,7 +164,7 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
     ret = scripts.set_db_config(db_connection)
 
     logger.info("Configuring docker swarm...")
-    c = docker.DockerClient(base_url=f"tcp://{DEV_IP}:2375", version="auto")
+    c = docker.DockerClient(base_url="unix://var/run/docker.sock", version="auto")
     try:
         if c.swarm.attrs and "ID" in c.swarm.attrs:
             logger.info("Docker swarm found, leaving swarm now")

{sbcli_dev-14.0.76 → sbcli_dev-14.0.78}/simplyblock_core/controllers/health_controller.py

@@ -51,19 +51,6 @@ def check_cluster(cluster_id):
     return result
 
 
-def _check_node_docker_api(ip):
-    return True
-    # try:
-    #     node_docker = docker.DockerClient(base_url=f"tcp://{ip}:2375", version="auto", timeout=3)
-    #     ret = node_docker.info()
-    #     if ret:
-    #         logger.debug(ret)
-    #         return True
-    # except Exception as e:
-    #     logger.error(f"Failed to connect to node's docker: {e}")
-    # return False
-
-
 def _check_node_rpc(rpc_ip, rpc_port, rpc_username, rpc_password, timeout=3, retry=2):
     try:
         rpc_client = RPCClient(
@@ -242,10 +229,6 @@ def check_node(node_id, with_devices=True):
         snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
     logger.info(f"Check: node RPC {snode.mgmt_ip}:{snode.rpc_port} ... {node_rpc_check}")
 
-    # 4- docker API
-    node_docker_check = _check_node_docker_api(snode.mgmt_ip)
-    logger.info(f"Check: node docker API {snode.mgmt_ip}:2375 ... {node_docker_check}")
-
     data_nics_check = True
     for data_nic in snode.data_nics:
         if data_nic.ip4_address:
@@ -261,7 +244,7 @@ def check_node(node_id, with_devices=True):
         lvol_port_check = _check_port_on_node(snode, snode.lvol_subsys_port)
         logger.info(f"Check: node {snode.mgmt_ip}, port: {snode.lvol_subsys_port} ... {lvol_port_check}")
 
-    is_node_online = ping_check and node_api_check and node_rpc_check and node_docker_check
+    is_node_online = ping_check and node_api_check and node_rpc_check
 
     logger.info(f"Results : {is_node_online}")
     print("*" * 100)

{sbcli_dev-14.0.76 → sbcli_dev-14.0.78}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=14.0.76
+SIMPLY_BLOCK_VERSION=14.0.78
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 DOCKER_USER=hamdysimplyblock

{sbcli_dev-14.0.76 → sbcli_dev-14.0.78}/simplyblock_core/services/storage_node_monitor.py

@@ -247,8 +247,6 @@ while True:
                 spdk_process = health_controller._check_spdk_process_up(snode.mgmt_ip)
             logger.info(f"Check: spdk process {snode.mgmt_ip}:5000 ... {spdk_process}")
 
-            # node_rpc_check = False
-            # if spdk_process:
                 # 4- check rpc
             node_rpc_check = health_controller._check_node_rpc(
                 snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password, timeout=5, retry=3)

{sbcli_dev-14.0.76 → sbcli_dev-14.0.78}/simplyblock_core/storage_node_ops.py

@@ -1522,9 +1522,10 @@ def remove_storage_node(node_id, force_remove=False, force_migrate=False):
 
     logger.debug("Leaving swarm...")
     try:
-        node_docker = docker.DockerClient(base_url=f"tcp://{snode.mgmt_ip}:2375", version="auto")
         cluster_docker = utils.get_docker_client(snode.cluster_id)
-        cluster_docker.nodes.get(node_docker.info()["Swarm"]["NodeID"]).remove(force=True)
+        for node in cluster_docker.nodes.list():
+            if node.attrs["Status"] and snode.mgmt_ip in node.attrs["Status"]["Addr"] :
+                node.remove(force=True)
     except:
         pass
 
@@ -2663,22 +2664,22 @@ def health_check(node_id):
         else:
             logger.error(f"Ping host: {snode.mgmt_ip}... Failed")
 
-        node_docker = docker.DockerClient(base_url=f"tcp://{snode.mgmt_ip}:2375", version="auto")
-        containers_list = node_docker.containers.list(all=True)
-        for cont in containers_list:
-            name = cont.attrs['Name']
-            state = cont.attrs['State']
-
-            if name in ['/spdk', '/spdk_proxy', '/SNodeAPI'] or name.startswith("/app_"):
-                logger.debug(state)
-                since = ""
-                try:
-                    start = datetime.datetime.fromisoformat(state['StartedAt'].split('.')[0])
-                    since = str(datetime.datetime.now() - start).split('.')[0]
-                except:
-                    pass
-                clean_name = name.split(".")[0].replace("/", "")
-                logger.info(f"Container: {clean_name}, Status: {state['Status']}, Since: {since}")
+        # node_docker = docker.DockerClient(base_url=f"tcp://{snode.mgmt_ip}:2375", version="auto")
+        # containers_list = node_docker.containers.list(all=True)
+        # for cont in containers_list:
+        #     name = cont.attrs['Name']
+        #     state = cont.attrs['State']
+        #
+        #     if name in ['/spdk', '/spdk_proxy', '/SNodeAPI'] or name.startswith("/app_"):
+        #         logger.debug(state)
+        #         since = ""
+        #         try:
+        #             start = datetime.datetime.fromisoformat(state['StartedAt'].split('.')[0])
+        #             since = str(datetime.datetime.now() - start).split('.')[0]
+        #         except:
+        #             pass
+        #         clean_name = name.split(".")[0].replace("/", "")
+        #         logger.info(f"Container: {clean_name}, Status: {state['Status']}, Since: {since}")
 
     except Exception as e:
         logger.error(f"Failed to connect to node's docker: {e}")
@@ -2857,7 +2858,7 @@ def recreate_lvstore_on_sec(snode):
 
             remote_rpc_client.bdev_lvol_set_leader(False, lvs_name=node.lvstore)
             remote_rpc_client.bdev_distrib_force_to_non_leader(node.jm_vuid)
-            time.sleep(1)
+            # time.sleep(1)
 
         # ret, err = _create_bdev_stack(snode, node.lvstore_stack, primary_node=node)
         ret = rpc_client.bdev_examine(node.raid)
@@ -2873,7 +2874,7 @@ def recreate_lvstore_on_sec(snode):
             node.lvstore_status = "ready"
             node.write_to_db()
 
-        time.sleep(1)
+        # time.sleep(1)
         for lvol in lvol_list:
             is_created, error = add_lvol_thread(lvol, snode)
 
@@ -2959,7 +2960,7 @@ def recreate_lvstore(snode):
 
             sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore, bs_nonleadership=True)
             sec_rpc_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
-            time.sleep(1)
+            # time.sleep(1)
 
 
     ret = rpc_client.bdev_examine(snode.raid)