sbcli-hmdi 0.0.30__tar.gz → 0.0.32__tar.gz

{sbcli_hmdi-0.0.30 → sbcli_hmdi-0.0.32}/PKG-INFO

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

{sbcli_hmdi-0.0.30 → sbcli_hmdi-0.0.32}/sbcli_hmdi.egg-info/PKG-INFO

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

{sbcli_hmdi-0.0.30 → sbcli_hmdi-0.0.32}/simplyblock_core/env_var

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

{sbcli_hmdi-0.0.30 → sbcli_hmdi-0.0.32}/simplyblock_core/rpc_client.py

@@ -595,13 +595,13 @@ class RPCClient:
     def bdev_nvme_set_options(self):
         params = {
             # "action_on_timeout": "abort",
-            "bdev_retry_count": 3,
-            "transport_retry_count": 5,
+            "bdev_retry_count": 0,
+            "transport_retry_count": 0,
             "ctrlr_loss_timeout_sec": 1,
             "fast_io_fail_timeout_sec": 0,
             "reconnect_delay_sec": 1,
             "keep_alive_timeout_ms": 10000,
-            "transport_ack_timeout": 10,
+            "transport_ack_timeout": 9,
             "timeout_us": constants.NVME_TIMEOUT_US
         }
         return self._request("bdev_nvme_set_options", params)

{sbcli_hmdi-0.0.30 → sbcli_hmdi-0.0.32}/simplyblock_core/storage_node_ops.py

@@ -2869,29 +2869,29 @@ def recreate_lvstore(snode):
     if snode.is_secondary_node:
         return recreate_lvstore_on_sec(snode)
 
-    # connecting to remote devices
-    logger.info("Connecting to remote devices")
-    snode = db_controller.get_storage_node_by_id(snode.get_id())
-    snode.remote_devices = _connect_to_remote_devs(snode)
-    if snode.enable_ha_jm:
-        online_devs = []
-        for remote_device in snode.remote_jm_devices:
-            if remote_device.status == StorageNode.STATUS_ONLINE:
-                online_devs.append(remote_device)
-
-        if len(online_devs) < 2:
-            devs = get_sorted_ha_jms(snode)
-            for did in devs:
-                dev = db_controller.get_jm_device_by_id(did)
-                online_devs.append(dev)
-                if len(online_devs) > snode.ha_jm_count - 1:
-                    break
-
-        snode.remote_jm_devices = online_devs
-        snode.remote_jm_devices = _connect_to_remote_jm_devs(snode)
-    snode.write_to_db()
+    # # connecting to remote devices
+    # logger.info("Connecting to remote devices")
+    # snode = db_controller.get_storage_node_by_id(snode.get_id())
+    # snode.remote_devices = _connect_to_remote_devs(snode)
+    # if snode.enable_ha_jm:
+    #     online_devs = []
+    #     for remote_device in snode.remote_jm_devices:
+    #         if remote_device.status == StorageNode.STATUS_ONLINE:
+    #             online_devs.append(remote_device)
+    #
+    #     if len(online_devs) < 2:
+    #         devs = get_sorted_ha_jms(snode)
+    #         for did in devs:
+    #             dev = db_controller.get_jm_device_by_id(did)
+    #             online_devs.append(dev)
+    #             if len(online_devs) > snode.ha_jm_count - 1:
+    #                 break
+    #
+    #     snode.remote_jm_devices = online_devs
+    #     snode.remote_jm_devices = _connect_to_remote_jm_devs(snode)
+    # snode.write_to_db()
 
-    time.sleep(1)
+    # time.sleep(1)
 
     ret, err = _create_bdev_stack(snode, [], primary_node=snode)
 
@@ -2978,10 +2978,9 @@ def recreate_lvstore(snode):
     #
     # 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 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:
@@ -3013,7 +3012,7 @@ def recreate_lvstore(snode):
         return False
 
     if sec_node.status == StorageNode.STATUS_ONLINE:
-        time.sleep(10)
+        time.sleep(5)
         sec_node_api.firewall_set_port(snode.lvol_subsys_port, "tcp", "allow")
 
         # sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password, timeout=3, retry=2)

{sbcli_hmdi-0.0.30 → sbcli_hmdi-0.0.32}/simplyblock_web/node_utils.py

@@ -181,18 +181,18 @@ def firewall_port(port_id=9090, port_type="tcp", block=True):
             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 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",
+            # 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 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 -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",