sbcli-dev 4.0.14__zip → 4.0.16__zip

{sbcli_dev-4.0.14 → sbcli_dev-4.0.16}/PKG-INFO

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

{sbcli_dev-4.0.14 → sbcli_dev-4.0.16}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=4.0.14
+SIMPLY_BLOCK_VERSION=4.0.16
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main-dev

{sbcli_dev-4.0.14 → sbcli_dev-4.0.16}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.14 → sbcli_dev-4.0.16}/simplyblock_core/cluster_ops.py

@@ -26,12 +26,6 @@ TOP_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 
 
 def _create_update_user(cluster_id, grafana_url, grafana_secret, user_secret, update_secret=False):
-    if not grafana_url.startswith("https://"):
-        if grafana_url.startswith("http://"):
-            grafana_url = grafana_url.replace("http://", "https://", 1)
-        else:
-            grafana_url = "https://" + grafana_url
-
     session = requests.session()
     session.auth = ("admin", grafana_secret)
     headers = {
@@ -135,7 +129,7 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
             c.swarm.leave(force=True)
             time.sleep(3)
 
-        c.swarm.init()
+        c.swarm.init(DEV_IP)
         logger.info("Configuring docker swarm > Done")
     except Exception as e:
         print(e)

{sbcli_dev-4.0.14 → sbcli_dev-4.0.16}/simplyblock_core/rpc_client.py

@@ -472,7 +472,9 @@ class RPCClient:
             "fabrics_connect_timeout_us": 100000,
             "fast_io_fail_timeout_sec": 1,
             "num_io_queues": 16384,
-            "ctrlr_loss_timeout_sec": 2,
+            "ctrlr_loss_timeout_sec": 1,
+            "multipath":"disable",
+            "reconnect_delay_sec":1
         }
         return self._request("bdev_nvme_attach_controller", params)
 
@@ -485,8 +487,10 @@ class RPCClient:
             "trsvcid": str(port),
             "subnqn": nqn,
             "fast_io_fail_timeout_sec": 1,
-            "ctrlr_loss_timeout_sec": 1,
+            "ctrlr_loss_timeout_sec": 3,
             "reconnect_delay_sec": 1,
+            "fabrics_connect_timeout_us": 100000,
+            "multipath":"disable"
         }
         return self._request("bdev_nvme_attach_controller", params)
 

{sbcli_dev-4.0.14 → sbcli_dev-4.0.16}/simplyblock_core/services/main_distr_event_collector.py

@@ -50,9 +50,9 @@ def process_device_event(event):
         if device.node_id != node_id:
             logger.info(f"Setting storage id: {storage_id} unavailable")
             distr_controller.send_dev_status_event(device, NVMeDevice.STATUS_UNAVAILABLE, node)
-            if device.status == NVMeDevice.STATUS_ONLINE:
-                device_controller.device_set_io_error(device_id, True)
-                device_controller.device_set_unavailable(device_id)
+            # if device.status == NVMeDevice.STATUS_ONLINE:
+            #     device_controller.device_set_io_error(device_id, True)
+            #     device_controller.device_set_unavailable(device_id)
 
         else:
             if node.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_SUSPENDED]:

{sbcli_dev-4.0.14 → sbcli_dev-4.0.16}/simplyblock_core/storage_node_ops.py

@@ -829,7 +829,10 @@ def _connect_to_remote_jm_devs(this_node, jm_ids=[]):
             logger.debug(f"bdev found {bdev_name}")
             jm_dev.status = JMDevice.STATUS_ONLINE
         else:
-            logger.info(f"Connecting {this_node.get_id()} to {name}")
+
+            logger.info(f"Connecting {name} to {this_node.get_id()}")
+            ret = rpc_client.bdev_nvme_detach_controller(name)
+            time.sleep(1)
             ret = rpc_client.bdev_nvme_attach_controller_tcp(
                 name, jm_dev.nvmf_nqn, jm_dev.nvmf_ip, jm_dev.nvmf_port)
             if ret:
@@ -1704,8 +1707,11 @@ def restart_storage_node(
 
     if snode.enable_ha_jm:
         logger.info("Connecting to remote JMs")
+        snode.remote_jm_devices = []
         snode.remote_jm_devices = _connect_to_remote_jm_devs(snode)
 
+    snode.write_to_db(db_controller.kv_store)
+
     logger.info("Setting node status to Online")
     set_node_status(node_id, StorageNode.STATUS_ONLINE)
 

{sbcli_dev-4.0.14 → sbcli_dev-4.0.16}/simplyblock_web/blueprints/snode_ops.py

@@ -40,6 +40,29 @@ def get_google_cloud_info():
         pass
 
 
+def get_equinix_cloud_info():
+    try:
+        response = requests.get("https://metadata.platformequinix.com/metadata")
+        data = response.json()
+        public_ip = ""
+        ip = ""
+        for interface in data["network"]["addresses"]:
+            if interface["address_family"] == 4:
+                if interface["enabled"] and interface["public"]:
+                    public_ip = interface["address"]
+                elif interface["enabled"] and not interface["public"]:
+                    public_ip = interface["address"]
+        return {
+            "id": str(data["id"]),
+            "type": data["class"],
+            "cloud": "equinix",
+            "ip": public_ip,
+            "public_ip": ip
+        }
+    except:
+        pass
+
+
 def get_amazon_cloud_info():
     try:
         from ec2_metadata import ec2_metadata
@@ -408,6 +431,9 @@ CLOUD_INFO = get_amazon_cloud_info()
 if not CLOUD_INFO:
     CLOUD_INFO = get_google_cloud_info()
 
+if not CLOUD_INFO:
+    CLOUD_INFO = get_equinix_cloud_info()
+
 if CLOUD_INFO:
     SYSTEM_ID = CLOUD_INFO["id"]
 else:

{sbcli_dev-4.0.14 → sbcli_dev-4.0.16}/simplyblock_web/blueprints/snode_ops_k8s.py

@@ -74,6 +74,29 @@ def get_google_cloud_info():
         pass
 
 
+def get_equinix_cloud_info():
+    try:
+        response = requests.get("https://metadata.platformequinix.com/metadata")
+        data = response.json()
+        public_ip = ""
+        ip = ""
+        for interface in data["network"]["addresses"]:
+            if interface["address_family"] == 4:
+                if interface["enabled"] and interface["public"]:
+                    public_ip = interface["address"]
+                elif interface["enabled"] and not interface["public"]:
+                    public_ip = interface["address"]
+        return {
+            "id": str(data["id"]),
+            "type": data["class"],
+            "cloud": "equinix",
+            "ip": public_ip,
+            "public_ip": ip
+        }
+    except:
+        pass
+
+
 def get_amazon_cloud_info():
     try:
         from ec2_metadata import ec2_metadata
@@ -280,6 +303,9 @@ CLOUD_INFO = get_amazon_cloud_info()
 if not CLOUD_INFO:
     CLOUD_INFO = get_google_cloud_info()
 
+if not CLOUD_INFO:
+    CLOUD_INFO = get_equinix_cloud_info()
+
 if CLOUD_INFO:
     SYSTEM_ID = CLOUD_INFO["id"]
 else: