sbcli-hmdi 0.0.36__tar.gz → 0.0.38__tar.gz

{sbcli_hmdi-0.0.36 → sbcli_hmdi-0.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.36
+Version: 0.0.38
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_hmdi-0.0.36 → sbcli_hmdi-0.0.38}/sbcli_hmdi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.36
+Version: 0.0.38
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_hmdi-0.0.36 → sbcli_hmdi-0.0.38}/simplyblock_core/controllers/health_controller.py

@@ -131,9 +131,15 @@ def _check_node_lvstore(lvstore_stack, node, auto_fix=False):
         elif type == "bdev_lvstore":
             bdev_lvstore = bdev["name"]
 
+    node_bdevs = rpc_client.get_bdevs()
+    if node_bdevs:
+        node_bdev_names = [b['name'] for b in node_bdevs]
+    else:
+        node_bdev_names = []
+
     for distr in distribs_list:
-        ret = rpc_client.get_bdevs(distr)
-        if ret:
+        # ret = rpc_client.get_bdevs(distr)
+        if distr in node_bdev_names:
             logger.info(f"Checking distr bdev : {distr} ... ok")
             logger.info("Checking Distr map ...")
             ret = rpc_client.distr_get_cluster_map(distr)
@@ -171,8 +177,8 @@ def _check_node_lvstore(lvstore_stack, node, auto_fix=False):
             logger.info(f"Checking distr bdev : {distr} ... not found")
             lvstore_check = False
     if raid:
-        ret = rpc_client.get_bdevs(raid)
-        if ret:
+        # ret = rpc_client.get_bdevs(raid)
+        if raid in node_bdev_names:
             logger.info(f"Checking raid bdev: {raid} ... ok")
         else:
             logger.info(f"Checking raid bdev: {raid} ... not found")

{sbcli_hmdi-0.0.36 → sbcli_hmdi-0.0.38}/simplyblock_core/db_controller.py

@@ -306,8 +306,6 @@ class DBController(metaclass=Singleton):
         ret = StorageNode().read_from_db(self.kv_store)
         nodes = []
         for node in ret:
-            if node.secondary_node_id == node_id \
-                    and node.status == StorageNode.STATUS_ONLINE \
-                    and node.lvstore:
+            if node.secondary_node_id == node_id and node.lvstore:
                 nodes.append(node)
         return sorted(nodes, key=lambda x: x.create_dt)

{sbcli_hmdi-0.0.36 → sbcli_hmdi-0.0.38}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-hmdi
-SIMPLY_BLOCK_VERSION=0.0.36
+SIMPLY_BLOCK_VERSION=0.0.38
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:hmdi
 DOCKER_USER=hamdysimplyblock

{sbcli_hmdi-0.0.36 → sbcli_hmdi-0.0.38}/simplyblock_core/scripts/docker-compose-swarm.yml

@@ -1,6 +1,18 @@
 version: '3.8'
 
 services:
+
+  spdk-stats-collector:
+    image: $SIMPLYBLOCK_DOCKER_IMAGE
+    command: "python simplyblock_core/services/spdk_stats_collector.py"
+    volumes:
+          - '/etc/simplyblock:/etc/simplyblock'
+          - '/var/tmp/spdk.sock:/var/tmp/spdk.sock'
+    deploy:
+      mode: global
+      placement:
+        constraints: [ node.role == worker ]
+
   fdb-server:
     image: foundationdb/foundationdb:7.3.42
     entrypoint: "/usr/bin/fdbserver --listen-address 0.0.0.0:4500 --public-address $CLUSTER_IP:4500 --datadir /var/fdb/data --logdir /var/fdb/logs --locality-zoneid=$HOSTNAME --locality-machineid=$HOSTNAME --class unset"

{sbcli_hmdi-0.0.36 → sbcli_hmdi-0.0.38}/simplyblock_core/snode_client.py

@@ -143,3 +143,6 @@ class SNodeClient:
             "action": action,
         }
         return self._request("POST", "firewall_set_port", params)
+
+    def get_firewall(self,):
+        return self._request("GET", "get_firewall")

{sbcli_hmdi-0.0.36 → sbcli_hmdi-0.0.38}/simplyblock_web/blueprints/snode_ops.py

@@ -501,3 +501,9 @@ def firewall_set_port():
 
     ret = node_utils.firewall_port(port_id, port_type, block=action=="block")
     return utils.get_response(ret)
+
+
+@bp.route('/get_firewall', methods=['GET'])
+def get_firewall():
+    ret = node_utils.firewall_get()
+    return utils.get_response(ret)

{sbcli_hmdi-0.0.36 → sbcli_hmdi-0.0.38}/simplyblock_web/node_utils.py

@@ -204,3 +204,10 @@ def firewall_port(port_id=9090, port_type="tcp", block=True):
             logger.info(ret)
 
     return out
+
+
+def firewall_get():
+    cmd = "iptables -L -n"
+    stream = os.popen(cmd)
+    ret = stream.read()
+    return ret