sbcli-dev 4.0.13__zip → 4.0.15__zip

{sbcli_dev-4.0.13 → sbcli_dev-4.0.15}/PKG-INFO

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

{sbcli_dev-4.0.13 → sbcli_dev-4.0.15}/env_var

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

{sbcli_dev-4.0.13 → sbcli_dev-4.0.15}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.13 → sbcli_dev-4.0.15}/simplyblock_core/cluster_ops.py

@@ -135,7 +135,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.13 → sbcli_dev-4.0.15}/simplyblock_core/services/main_distr_event_collector.py

@@ -33,17 +33,8 @@ def process_device_event(event):
                     if dev.status not in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_READONLY]:
                         logger.info(f"The storage device is not online, skipping. status: {dev.status}")
                         event.status = 'skipped'
-                        node_status_event = {
-                            "timestamp": datetime.datetime.now().isoformat("T", "seconds") + 'Z',
-                            "event_type": "device_status",
-                            "storage_ID": storage_id,
-                            "status": dev.status}
-                        events = {"events": [node_status_event]}
-                        snode = db_controller.get_storage_node_by_id(node_id)
-                        rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
-                        ret = rpc_client.distr_status_events_update(events)
-                        if not ret:
-                            logger.warning("Failed to send event update")
+                        n = db_controller.get_storage_node_by_id(node_id)
+                        distr_controller.send_dev_status_event(dev, NVMeDevice.STATUS_UNAVAILABLE, n)
                         return
 
                     device = dev
@@ -57,30 +48,9 @@ def process_device_event(event):
         device_id = device.get_id()
         node = db_controller.get_storage_node_by_id(node_id)
         if device.node_id != node_id:
-            logger.info(f"Removing remote storage id: {storage_id} from node: {node_id}")
-            new_remote_devices = []
-            rpc_client = RPCClient(node.mgmt_ip, node.rpc_port,
-                                   node.rpc_username, node.rpc_password)
-            for rem_dev in node.remote_devices:
-                if rem_dev.get_id() == device.get_id():
-                    ctrl_name = rem_dev.remote_bdev[:-2]
-                    rpc_client.bdev_nvme_detach_controller(ctrl_name)
-                else:
-                    new_remote_devices.append(rem_dev)
-            node.remote_devices = new_remote_devices
-            node.write_to_db(db_controller.kv_store)
-            node_status_event = {
-                "timestamp": datetime.datetime.now().isoformat("T", "seconds") + 'Z',
-                "event_type": "device_status",
-                "storage_ID": storage_id,
-                "status": NVMeDevice.STATUS_UNAVAILABLE}
-            events = {"events": [node_status_event]}
-            ret = rpc_client.distr_status_events_update(events)
-            if not ret:
-                logger.warning("Failed to send event update")
-
-            dev_node = db_controller.get_storage_node_by_id(device.node_id)
-            if dev_node.status == StorageNode.STATUS_ONLINE:
+            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)
 
@@ -156,7 +126,7 @@ def start_event_collector_on_node(node_id):
         snode.rpc_port,
         snode.rpc_username,
         snode.rpc_password,
-        timeout=10, retry=2)
+        timeout=5, retry=2)
 
     while True:
         page = 1

{sbcli_dev-4.0.13 → sbcli_dev-4.0.15}/simplyblock_core/services/tasks_runner_restart.py

@@ -219,4 +219,7 @@ while True:
                             tasks_events.task_updated(task)
                         else:
                             time.sleep(delay_seconds)
-                            delay_seconds *= 2
+                            if task.retry <= 3 and task.function_name == JobSchedule.FN_DEV_RESTART:
+                                delay_seconds *= 1
+                            else:
+                                delay_seconds *= 2

{sbcli_dev-4.0.13 → sbcli_dev-4.0.15}/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.13 → sbcli_dev-4.0.15}/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:

{sbcli_dev-4.0.13 → sbcli_dev-4.0.15}/simplyblock_web/blueprints/web_api_storage_node.py

@@ -197,6 +197,7 @@ def storage_node_add():
     max_prov = req_data['max_prov']
     number_of_distribs = int(req_data.get('number_of_distribs', 4))
     disable_ha_jm = bool(req_data.get('disable_ha_jm', False))
+    enable_test_device = bool(req_data.get('enable_test_device', False))
 
     spdk_image = None
     if 'spdk_image' in req_data:
@@ -259,7 +260,7 @@ def storage_node_add():
         "num_partitions_per_dev": partitions,
         "jm_percent": jm_percent,
         "number_of_devices": number_of_devices,
-        "enable_test_device": False,
+        "enable_test_device": enable_test_device,
         "number_of_distribs": number_of_distribs,
         "namespace": namespace,
         "enable_ha_jm": not disable_ha_jm})