sbcli-dev 10.1.74__tar.gz → 10.1.76__tar.gz

{sbcli_dev-10.1.74 → sbcli_dev-10.1.76}/PKG-INFO

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

{sbcli_dev-10.1.74 → sbcli_dev-10.1.76}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.1.74 → sbcli_dev-10.1.76}/simplyblock_core/controllers/lvol_controller.py

@@ -668,7 +668,7 @@ def add_lvol_on_node(lvol, snode, ha_comm_addrs=None, ha_inode_self=0):
 def recreate_lvol_on_node(lvol, snode, ha_inode_self=0, ana_state=None):
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
 
-    retry = 5
+    retry = 3
     while retry > 0:
         lv = rpc_client.get_bdevs(lvol.top_bdev)
         if lv:

{sbcli_dev-10.1.74 → sbcli_dev-10.1.76}/simplyblock_core/env_var

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

{sbcli_dev-10.1.74 → sbcli_dev-10.1.76}/simplyblock_core/storage_node_ops.py

@@ -3119,14 +3119,14 @@ def dump_lvstore(node_id):
         logger.error("Storage node does not have lvstore")
         return False
 
-    rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password, timeout=300, retry=0)
+    rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password, timeout=3, retry=0)
     logger.info(f"Dumping lvstore data on node: {snode.get_id()}")
     file_name = f"LVS_dump_{snode.hostname}_{snode.lvstore}_{str(datetime.datetime.now().isoformat())}.txt"
     file_path = f"/etc/simplyblock/{file_name}"
     ret = rpc_client.bdev_lvs_dump(snode.lvstore, file_path)
-    if not ret:
-        logger.error("faild to dump lvstore data")
-        return False
+    # if not ret:
+    #     logger.error("faild to dump lvstore data")
+    #     return False
 
-    logger.info(f"LVS dump file path: {file_path}")
+    logger.info(f"LVS dump file will be here: {file_path}")
     return True

{sbcli_dev-10.1.74 → sbcli_dev-10.1.76}/simplyblock_core/utils.py

@@ -305,7 +305,7 @@ def get_random_vuid():
             type = bdev['type']
             if type == "bdev_distr":
                 vuid = bdev['params']['vuid']
-            elif type == "bdev_raid":
+            elif type == "bdev_raid"  and "jm_vuid" in bdev:
                 vuid = bdev['jm_vuid']
             else:
                 continue

{sbcli_dev-10.1.74 → sbcli_dev-10.1.76}/simplyblock_web/blueprints/snode_ops.py

@@ -67,15 +67,16 @@ def get_equinix_cloud_info():
 def get_amazon_cloud_info():
     try:
         import ec2_metadata
+        import requests
         session = requests.session()
         session.timeout = 3
-        data = ec2_metadata.EC2Metadata(session).instance_identity_document
+        data = ec2_metadata.EC2Metadata(session=session).instance_identity_document
         return {
             "id": data["instanceId"],
             "type": data["instanceType"],
             "cloud": "amazon",
             "ip": data["privateIp"],
-            "public_ip": ec2_metadata.public_ipv4 or "",
+            "public_ip":  "",
         }
     except:
         pass
@@ -156,11 +157,11 @@ def spdk_process_start():
         spdk_image = data['spdk_image']
         # node_docker.images.pull(spdk_image)
 
-    # if "cluster_ip" in data and data['cluster_ip']:
-    #     cluster_ip = data['cluster_ip']
-    #     log_config = LogConfig(type=LogConfig.types.GELF, config={"gelf-address": f"tcp://{cluster_ip}:12202"})
-    # else:
-    log_config = LogConfig(type=LogConfig.types.JOURNALD)
+    if "cluster_ip" in data and data['cluster_ip']:
+        cluster_ip = data['cluster_ip']
+        log_config = LogConfig(type=LogConfig.types.GELF, config={"gelf-address": f"tcp://{cluster_ip}:12202"})
+    else:
+        log_config = LogConfig(type=LogConfig.types.JOURNALD)
 
     container = node_docker.containers.run(
         spdk_image,