sbcli-hmdi 0.0.11__tar.gz → 0.0.13__tar.gz

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/PKG-INFO

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

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/sbcli_hmdi.egg-info/PKG-INFO

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

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/simplyblock_core/controllers/lvol_controller.py

@@ -449,6 +449,7 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
     lvol.hostname = host_node.hostname
     lvol.node_id = host_node.get_id()
     lvol.lvs_name = host_node.lvstore
+    lvol.subsys_port = host_node.lvol_subsys_port
     lvol.top_bdev = f"{lvol.lvs_name}/{lvol.lvol_bdev}"
     lvol.base_bdev = lvol.top_bdev
 
@@ -631,13 +632,13 @@ def add_lvol_on_node(lvol, snode, ha_comm_addrs=None, ha_inode_self=0, sec_is_pr
         if iface.ip4_address:
             tr_type = iface.get_transport_type()
             logger.info("adding listener for %s on IP %s" % (lvol.nqn, iface.ip4_address))
-            ret = rpc_client.listeners_create(lvol.nqn, tr_type, iface.ip4_address, "4420")
+            ret = rpc_client.listeners_create(lvol.nqn, tr_type, iface.ip4_address, lvol.subsys_port)
             is_optimized = False
             if lvol.node_id == snode.get_id():
                 is_optimized = True
             logger.info(f"Setting ANA state: {is_optimized}")
             ret = rpc_client.nvmf_subsystem_listener_set_ana_state(
-                lvol.nqn, iface.ip4_address, "4420", is_optimized)
+                lvol.nqn, iface.ip4_address, lvol.subsys_port, is_optimized)
 
     logger.info("Add BDev to subsystem")
     ret = rpc_client.nvmf_subsystem_add_ns(lvol.nqn, lvol.top_bdev, lvol.uuid, lvol.guid)
@@ -714,7 +715,7 @@ def recreate_lvol_on_node(lvol, snode, ha_inode_self=0, ana_state=None):
                     ana_state = "optimized"
             logger.info("adding listener for %s on IP %s" % (lvol.nqn, iface.ip4_address))
             logger.info(f"Setting ANA state: {ana_state}")
-            ret = rpc_client.listeners_create(lvol.nqn, tr_type, iface.ip4_address, "4420", ana_state)
+            ret = rpc_client.listeners_create(lvol.nqn, tr_type, iface.ip4_address, lvol.subsys_port, ana_state)
 
     return True, None
 
@@ -1111,7 +1112,7 @@ def connect_lvol(uuid):
         for nic in snode.data_nics:
             transport = nic.get_transport_type().lower()
             ip = nic.ip4_address
-            port = 4420
+            port = lvol.subsys_port
             out.append({
                 "transport": transport,
                 "ip": ip,

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/simplyblock_core/env_var

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

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/simplyblock_core/models/lvol_model.py

@@ -48,6 +48,7 @@ class LVol(BaseModel):
     node_id: str = ""
     nodes: List[str] = []
     nqn: str = ""
+    subsys_port: int = 9090
     nvme_dev: NVMeDevice = None
     pool_uuid: str = ""
     pvc_name: str = ""

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/simplyblock_core/models/storage_node.py

@@ -53,6 +53,7 @@ class StorageNode(BaseNodeObject):
     lvstore_stack: List[dict] = []
     lvstore_stack_secondary_1: List[dict] = []
     lvstore_stack_secondary_2: List[dict] = []
+    lvol_subsys_port: int = 9090
     max_lvol: int = 0
     max_prov: int = 0
     max_snap: int = 0

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/simplyblock_core/rpc_client.py

@@ -178,7 +178,7 @@ class RPCClient:
                 "trtype": trtype,
                 "adrfam": "IPv4",
                 "traddr": traddr,
-                "trsvcid": trsvcid
+                "trsvcid": str(trsvcid)
             }
         }
         if ana_state:
@@ -901,7 +901,7 @@ class RPCClient:
                 "trtype": trtype,
                 "adrfam": "IPv4",
                 "traddr": traddr,
-                "trsvcid": trsvcid
+                "trsvcid": str(trsvcid)
             }
         }
         return self._request("nvmf_subsystem_remove_listener", params)
@@ -980,9 +980,10 @@ class RPCClient:
         }
         return self._request("nvmf_set_max_subsystems", params)
 
-    def bdev_lvol_set_lvs_groupid(self, lvs_name, groupid):
+    def bdev_lvol_set_lvs_ops(self, lvs_name, groupid, subsystem_port=9090):
         params = {
             "groupid": groupid,
             "lvs_name": lvs_name,
+            "subsystem_port": subsystem_port,
         }
-        return self._request("bdev_lvol_set_lvs_groupid", params)
+        return self._request("bdev_lvol_set_lvs_op", params)

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/simplyblock_core/scripts/install_deps.sh

@@ -3,7 +3,7 @@
 sudo yum install -y yum-utils xorg-x11-xauth nvme-cli fio
 sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
 sudo yum install hostname pkg-config git wget python3-pip yum-utils docker-ce docker-ce-cli \
-  containerd.io docker-buildx-plugin docker-compose-plugin -y
+  containerd.io docker-buildx-plugin docker-compose-plugin iptables -y
 
 sudo systemctl enable docker
 sudo systemctl start docker
@@ -27,4 +27,11 @@ sudo chmod 777 /etc/simplyblock
 
 sudo sh -c 'echo 1 >  /proc/sys/vm/drop_caches'
 
-sudo sed -i 's/ProcessSizeMax=.*/ProcessSizeMax=5G/' /etc/systemd/coredump.conf
+sudo sed -i 's/ProcessSizeMax=.*/ProcessSizeMax=5G/' /etc/systemd/coredump.conf
+
+sudo systemctl restart iptables
+sudo iptables -F
+sudo iptables -X
+sudo iptables -P INPUT ACCEPT
+sudo iptables -P FORWARD ACCEPT
+sudo iptables -P OUTPUT ACCEPT

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/simplyblock_core/snode_client.py

@@ -134,3 +134,12 @@ class SNodeClient:
 
     def get_file_content(self, file_name):
         return self._request("GET", f"get_file_content/{file_name}")
+
+
+    def firewall_set_port(self, port_id, port_type="tcp", action="block"):
+        params = {
+            "port_id": port_id,
+            "port_type": port_type,
+            "action": action,
+        }
+        return self._request("POST", "firewall_set_port", params)

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/simplyblock_core/storage_node_ops.py

@@ -2214,7 +2214,7 @@ def suspend_storage_node(node_id, force=False):
                     for iface in snode.data_nics:
                         if iface.ip4_address:
                             ret = rpc_client.nvmf_subsystem_listener_set_ana_state(
-                                lvol.nqn, iface.ip4_address, "4420", False, ana="inaccessible")
+                                lvol.nqn, iface.ip4_address, lvol.subsys_port, False, ana="inaccessible")
 
                 rpc_client.bdev_lvol_set_leader(False, lvs_name=node.lvstore)
                 rpc_client.bdev_distrib_force_to_non_leader(node.jm_vuid)
@@ -2229,7 +2229,7 @@ def suspend_storage_node(node_id, force=False):
                 for iface in sec_node.data_nics:
                     if iface.ip4_address:
                         ret = sec_node_client.nvmf_subsystem_listener_set_ana_state(
-                            lvol.nqn, iface.ip4_address, "4420", False, ana="inaccessible")
+                            lvol.nqn, iface.ip4_address, lvol.subsys_port, False, ana="inaccessible")
 
             # sec_node_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore)
             # sec_node_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
@@ -2239,7 +2239,7 @@ def suspend_storage_node(node_id, force=False):
             for iface in snode.data_nics:
                 if iface.ip4_address:
                     ret = rpc_client.nvmf_subsystem_listener_set_ana_state(
-                        lvol.nqn, iface.ip4_address, "4420", False, ana="inaccessible")
+                        lvol.nqn, iface.ip4_address, lvol.subsys_port, False, ana="inaccessible")
             time.sleep(3)
 
         rpc_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore)
@@ -2254,7 +2254,7 @@ def suspend_storage_node(node_id, force=False):
                 for iface in sec_node.data_nics:
                     if iface.ip4_address:
                         ret = sec_node_client.nvmf_subsystem_listener_set_ana_state(
-                            lvol.nqn, iface.ip4_address, "4420", False)
+                            lvol.nqn, iface.ip4_address, lvol.subsys_port, False)
 
 
     if snode.jm_device and snode.jm_device.status != JMDevice.STATUS_REMOVED:
@@ -2320,7 +2320,7 @@ def resume_storage_node(node_id):
                     for iface in snode.data_nics:
                         if iface.ip4_address:
                             ret = rpc_client.nvmf_subsystem_listener_set_ana_state(
-                                lvol.nqn, iface.ip4_address, "4420", False)
+                                lvol.nqn, iface.ip4_address, lvol.subsys_port, False)
 
 
     else:
@@ -2338,7 +2338,7 @@ def resume_storage_node(node_id):
                     for iface in sec_node.data_nics:
                         if iface.ip4_address:
                             ret = sec_node_client.nvmf_subsystem_listener_set_ana_state(
-                                lvol.nqn, iface.ip4_address, "4420", False, ana="inaccessible")
+                                lvol.nqn, iface.ip4_address, lvol.subsys_port, False, ana="inaccessible")
                 time.sleep(1)
                 sec_node_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore)
                 sec_node_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
@@ -2348,7 +2348,7 @@ def resume_storage_node(node_id):
             for iface in snode.data_nics:
                 if iface.ip4_address:
                     ret = rpc_client.nvmf_subsystem_listener_set_ana_state(
-                            lvol.nqn, iface.ip4_address, "4420", True)
+                            lvol.nqn, iface.ip4_address, lvol.subsys_port, True)
 
         time.sleep(3)
 
@@ -2359,7 +2359,7 @@ def resume_storage_node(node_id):
                 for iface in sec_node.data_nics:
                     if iface.ip4_address:
                         ret = sec_node_client.nvmf_subsystem_listener_set_ana_state(
-                            lvol.nqn, iface.ip4_address, "4420", False)
+                            lvol.nqn, iface.ip4_address, lvol.subsys_port, False)
 
     logger.info("Setting node status to online")
     set_node_status(snode.get_id(), StorageNode.STATUS_ONLINE)
@@ -2810,7 +2810,7 @@ def recreate_lvstore_on_sec(snode):
                 for iface in node.data_nics:
                     if iface.ip4_address:
                         ret = remote_rpc_client.nvmf_subsystem_listener_set_ana_state(
-                            lvol.nqn, iface.ip4_address, "4420", False, "inaccessible")
+                            lvol.nqn, iface.ip4_address, lvol.subsys_port, False, "inaccessible")
 
             remote_rpc_client.bdev_lvol_set_leader(False, lvs_name=node.lvstore)
             remote_rpc_client.bdev_distrib_force_to_non_leader(node.jm_vuid)
@@ -2818,7 +2818,7 @@ def recreate_lvstore_on_sec(snode):
         ret, err = _create_bdev_stack(snode, node.lvstore_stack, primary_node=node)
         ret = rpc_client.bdev_examine(node.raid)
         ret = rpc_client.bdev_wait_for_examine()
-        ret = rpc_client.bdev_lvol_set_lvs_groupid(node.lvstore, node.jm_vuid)
+        ret = rpc_client.bdev_lvol_set_lvs_ops(node.lvstore, node.jm_vuid, node.lvol_subsys_port)
 
         for lvol in lvol_list:
             is_created, error = lvol_controller.recreate_lvol_on_node(
@@ -2840,7 +2840,7 @@ def recreate_lvstore_on_sec(snode):
                 for iface in node.data_nics:
                     if iface.ip4_address:
                         ret = remote_rpc_client.nvmf_subsystem_listener_set_ana_state(
-                            lvol.nqn, iface.ip4_address, "4420", True)
+                            lvol.nqn, iface.ip4_address, lvol.subsys_port, True)
 
             time.sleep(5)
 
@@ -2848,7 +2848,7 @@ def recreate_lvstore_on_sec(snode):
             for iface in snode.data_nics:
                 if iface.ip4_address:
                     ret = rpc_client.nvmf_subsystem_listener_set_ana_state(
-                        lvol.nqn, iface.ip4_address, "4420", False)
+                        lvol.nqn, iface.ip4_address, lvol.subsys_port, False)
 
     return True
 
@@ -2873,7 +2873,10 @@ def recreate_lvstore(snode):
                     for iface in sec_node.data_nics:
                         if iface.ip4_address:
                             ret = sec_rpc_client.nvmf_subsystem_listener_set_ana_state(
-                                lvol.nqn, iface.ip4_address, "4420", False, "inaccessible")
+                                lvol.nqn, iface.ip4_address, lvol.subsys_port, False, "inaccessible")
+
+            # sec_node_api = SNodeClient(sec_node.api_endpoint)
+            # sec_node_api.firewall_set_port(snode.lvol_subsys_port, "tcp", "block")
 
             sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore)
             sec_rpc_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
@@ -2918,12 +2921,14 @@ def recreate_lvstore(snode):
 
     ret = rpc_client.bdev_examine(snode.raid)
     ret = rpc_client.bdev_wait_for_examine()
-    ret = rpc_client.bdev_lvol_set_lvs_groupid(snode.lvstore, snode.jm_vuid)
+    time.sleep(1)
+
+    ret = rpc_client.bdev_lvol_set_lvs_ops(snode.lvstore, snode.jm_vuid, snode.lvol_subsys_port)
 
-    if not prim_node_suspend:
-        if snode.jm_vuid:
-            ret = rpc_client.jc_explicit_synchronization(snode.jm_vuid)
-            logger.info(f"JM Sync res: {ret}")
+    # if not prim_node_suspend:
+    #     if snode.jm_vuid:
+    #         ret = rpc_client.jc_explicit_synchronization(snode.jm_vuid)
+    #         logger.info(f"JM Sync res: {ret}")
 
     lvol_ana_state = "optimized"
     if prim_node_suspend:
@@ -2955,7 +2960,7 @@ def recreate_lvstore(snode):
                 for iface in sec_node.data_nics:
                     if iface.ip4_address:
                         ret = sec_rpc_client.nvmf_subsystem_listener_set_ana_state(
-                            lvol.nqn, iface.ip4_address, "4420", False)
+                            lvol.nqn, iface.ip4_address, lvol.subsys_port, False)
     return True
 
 
@@ -3014,6 +3019,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
     strip_size_kb = utils.nearest_upper_power_of_2(strip_size_kb)
     jm_vuid = 0
     jm_ids = []
+    lvol_subsys_port = 9090
     if snode.enable_ha_jm:
         jm_vuid = utils.get_random_vuid()
         jm_ids = get_sorted_ha_jms(snode)
@@ -3089,6 +3095,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
     snode.lvstore = lvs_name
     snode.lvstore_stack = lvstore_stack
     snode.raid = raid_device
+    snode.lvol_subsys_port = lvol_subsys_port
     snode.write_to_db()
 
     ret, err = _create_bdev_stack(snode, lvstore_stack)
@@ -3112,7 +3119,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
 
         ret = temp_rpc_client.bdev_examine(snode.raid)
         ret = temp_rpc_client.bdev_wait_for_examine()
-        ret = temp_rpc_client.bdev_lvol_set_lvs_groupid(snode.lvstore, snode.jm_vuid)
+        ret = temp_rpc_client.bdev_lvol_set_lvs_ops(snode.lvstore, snode.jm_vuid, snode.lvol_subsys_port)
 
         sec_node_1.write_to_db()
 
@@ -3171,7 +3178,7 @@ def _create_bdev_stack(snode, lvstore_stack=None, primary_node=None):
         elif type == "bdev_lvstore" and lvstore_stack and not snode.is_secondary_node:
             ret = rpc_client.create_lvstore(**params)
             if ret and snode.jm_vuid > 0:
-                rpc_client.bdev_lvol_set_lvs_groupid(snode.lvstore, snode.jm_vuid)
+                rpc_client.bdev_lvol_set_lvs_ops(snode.lvstore, snode.jm_vuid, snode.lvol_subsys_port)
 
         elif type == "bdev_ptnonexcl":
             ret = rpc_client.bdev_PT_NoExcl_create(**params)

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/simplyblock_web/blueprints/snode_ops.py

@@ -483,3 +483,21 @@ def bind_device_to_spdk():
         time.sleep(1)
 
     return utils.get_response(True)
+
+
+@bp.route('/firewall_set_port', methods=['POST'])
+def firewall_set_port():
+    data = request.get_json()
+    if "port_id" not in data:
+        return utils.get_response(False, "Required parameter is missing: port_id")
+    if "port_type" not in data:
+        return utils.get_response(False, "Required parameter is missing: port_type")
+    if "action" not in data:
+        return utils.get_response(False, "Required parameter is missing: action")
+
+    port_id = data['port_id']
+    port_type = data['port_type']
+    action = data['action']
+
+    ret = node_utils.firewall_port(port_id, port_type, block=action=="block")
+    return utils.get_response(ret)

{sbcli_hmdi-0.0.11 → sbcli_hmdi-0.0.13}/simplyblock_web/node_utils.py

@@ -170,3 +170,42 @@ def get_memory_details():
 def get_host_arch():
     out, err, rc = run_command("uname -m")
     return out
+
+
+def firewall_port(port_id=9090, port_type="tcp", block=True):
+
+    if block:
+        cmd_list=[
+
+            f"iptables -D INPUT -p {port_type} --dport {port_id} -j ACCEPT",
+            f"iptables -D OUTPUT -p {port_type} --dport {port_id} -j ACCEPT",
+
+            f"iptables -A INPUT -p {port_type} --dport {port_id} -j DROP",
+            f"iptables -A INPUT -p {port_type} --dport {port_id} -j REJECT",
+            f"iptables -A OUTPUT -p {port_type} --dport {port_id} -j DROP",
+            f"iptables -A OUTPUT -p {port_type} --dport {port_id} -j REJECT",
+            "iptables -L -n",
+        ]
+    else:
+        cmd_list=[
+
+            f"iptables -D INPUT -p {port_type} --dport {port_id} -j DROP",
+            f"iptables -D INPUT -p {port_type} --dport {port_id} -j REJECT",
+            f"iptables -D OUTPUT -p {port_type} --dport {port_id} -j DROP",
+            f"iptables -D OUTPUT -p {port_type} --dport {port_id} -j REJECT",
+
+            f"iptables -A INPUT -p {port_type} --dport {port_id} -j ACCEPT",
+            f"iptables -A OUTPUT -p {port_type} --dport {port_id} -j ACCEPT",
+            "iptables -L -n",
+
+        ]
+
+    out = ""
+    for cmd in cmd_list:
+        stream = os.popen(cmd)
+        ret = stream.read()
+        if ret != "":
+            out += ret + "\n"
+            logger.info(ret)
+
+    return out