sbcli-dev 19.2.6__tar.gz → 19.2.7__tar.gz

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 19.2.6
+Version: 19.2.7
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
 Author-email: hamdy@simplyblock.io
 Description-Content-Type: text/markdown
-Requires-Dist: foundationdb==7.3.3
+Requires-Dist: foundationdb==7.3.63
 Requires-Dist: requests
 Requires-Dist: prettytable>=3.10.0
 Requires-Dist: docker

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/requirements.txt

@@ -1,4 +1,4 @@
-foundationdb==7.3.3
+foundationdb==7.3.63
 requests
 prettytable>=3.10.0
 docker

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/sbcli_dev.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 19.2.6
+Version: 19.2.7
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
 Author-email: hamdy@simplyblock.io
 Description-Content-Type: text/markdown
-Requires-Dist: foundationdb==7.3.3
+Requires-Dist: foundationdb==7.3.63
 Requires-Dist: requests
 Requires-Dist: prettytable>=3.10.0
 Requires-Dist: docker

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/sbcli_dev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-foundationdb==7.3.3
+foundationdb==7.3.63
 requests
 prettytable>=3.10.0
 docker

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/simplyblock_cli/cli.py

@@ -168,7 +168,7 @@ class CLIWrapper(CLIWrapperBase):
             argument = subcommand.add_argument('--iobuf_large_bufsize', help='bdev_set_options param', type=int, default=0, dest='large_bufsize')
         argument = subcommand.add_argument('--force', help='Force restart', dest='force', action='store_true')
         argument = subcommand.add_argument('--ssd-pcie', help='New Nvme PCIe address to add to the storage node. Can be more than one.', type=str, default='', dest='ssd_pcie', required=False, nargs='+')
-        argument = subcommand.add_argument('--force-lvol-recreate', help='Force LVol recreate on node restart even if lvol bdev was not recovered', type=bool, dest='force_lvol_recreate')
+        argument = subcommand.add_argument('--force-lvol-recreate', help='Force LVol recreate on node restart even if lvol bdev was not recovered', default=False, dest='force_lvol_recreate', action='store_true')
 
     def init_storage_node__shutdown(self, subparser):
         subcommand = self.add_sub_command(subparser, 'shutdown', 'Initiates a storage node shutdown')

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/simplyblock_core/controllers/lvol_controller.py

@@ -1058,6 +1058,14 @@ def set_lvol(uuid, max_rw_iops, max_rw_mbytes, max_r_mbytes, max_w_mbytes, name=
     if not ret:
         return "Error setting qos limits"
 
+    if snode.secondary_node_id:
+        sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
+        if sec_node and sec_node.status == [StorageNode.STATUS_ONLINE,  StorageNode.STATUS_DOWN]:
+            ret = sec_node.rpc_client().bdev_set_qos_limit(
+                lvol.top_bdev, rw_ios_per_sec, rw_mbytes_per_sec, r_mbytes_per_sec, w_mbytes_per_sec)
+            if not ret:
+                return "Error setting qos limits"
+
     lvol.rw_ios_per_sec = rw_ios_per_sec
     lvol.rw_mbytes_per_sec = rw_mbytes_per_sec
     lvol.r_mbytes_per_sec = r_mbytes_per_sec

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=19.2.6
+SIMPLY_BLOCK_VERSION=19.2.7
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/simplyblock_core/rpc_client.py

@@ -151,7 +151,7 @@ class RPCClient:
             "dif_insert_or_strip": False,
             "c2h_success": True,
             "sock_priority": 0,
-            "ack_timeout": 4096,
+            "ack_timeout": 8000,
         }
         return self._request("nvmf_create_transport", params)
 
@@ -640,7 +640,7 @@ class RPCClient:
             "reconnect_delay_sec": 1,
             "keep_alive_timeout_ms": 30000,
             "timeout_us": constants.NVME_TIMEOUT_US,
-            "transport_ack_timeout": 12,
+            "transport_ack_timeout": 13,
         }
         return self._request("bdev_nvme_set_options", params)
 

sbcli_dev-19.2.7/simplyblock_core/scripts/datasource.yml

@@ -0,0 +1,9 @@
+apiVersion: 1
+datasources:
+- name: Thanos
+  type: prometheus
+  url: http://thanos-query:9091
+  isDefault: true
+  access: proxy
+  uid: PBFA97CFB590B2093
+  editable: true

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/simplyblock_core/scripts/docker-compose-swarm-monitoring.yml

@@ -191,7 +191,6 @@ services:
       GF_SECURITY_ADMIN_PASSWORD: "${CLUSTER_SECRET}"
       GF_ALERTING_ENABLED: "true"
       GF_PATHS_PROVISIONING: "/etc/grafana/provisioning"
-      GF_INSTALL_PLUGINS: "grafana-opensearch-datasource"
       GF_SERVER_ROOT_URL: "${GRAFANA_ENDPOINT}"
     volumes:
       - ./datasource.yml:/etc/grafana/provisioning/datasources/datasource.yaml

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/simplyblock_core/scripts/docker-compose-swarm.yml

@@ -11,7 +11,7 @@ services:
 
   fdb-server:
     <<: *service-base
-    image: foundationdb/foundationdb:7.3.42
+    image: foundationdb/foundationdb:7.3.63
     networks:
       - hostnet
     environment:
@@ -34,7 +34,7 @@ services:
 
   fdb-backup-agent:
     <<: *service-base
-    image: foundationdb/foundationdb:7.3.42
+    image: foundationdb/foundationdb:7.3.63
     entrypoint: "/usr/bin/backup_agent -C  /etc/foundationdb/fdb.cluster"
     networks:
       - hostnet

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/simplyblock_core/scripts/foundation.yml

@@ -2,7 +2,7 @@
 services:
 
   fdb-server:
-    image: foundationdb/foundationdb:7.3.42
+    image: foundationdb/foundationdb:7.3.63
     environment:
       FDB_NETWORKING_MODE: 'container'
       FDB_CLUSTER_FILE: '/etc/foundationdb/fdb.cluster'

{sbcli_dev-19.2.6 → sbcli_dev-19.2.7}/simplyblock_core/storage_node_ops.py

@@ -628,7 +628,10 @@ def _prepare_cluster_devices_on_restart(snode, clear_data=False):
     return True
 
 
-def _connect_to_remote_devs(this_node, force_conect_restarting_nodes=False):
+def _connect_to_remote_devs(
+        this_node: StorageNode, /,
+        reattach: bool = True, force_connect_restarting_nodes: bool = False
+):
     db_controller = DBController()
 
     rpc_client = RPCClient(
@@ -646,7 +649,7 @@ def _connect_to_remote_devs(this_node, force_conect_restarting_nodes=False):
     allowed_node_statuses = [StorageNode.STATUS_ONLINE, StorageNode.STATUS_DOWN]
     allowed_dev_statuses = [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_READONLY, NVMeDevice.STATUS_CANNOT_ALLOCATE]
 
-    if force_conect_restarting_nodes:
+    if force_connect_restarting_nodes:
         allowed_node_statuses.append(StorageNode.STATUS_RESTARTING)
         allowed_dev_statuses.append(NVMeDevice.STATUS_UNAVAILABLE)
 
@@ -667,7 +670,7 @@ def _connect_to_remote_devs(this_node, force_conect_restarting_nodes=False):
 
             dev.remote_bdev = connect_device(
                     f"remote_{dev.alceml_bdev}", dev, rpc_client,
-                    bdev_names=node_bdev_names, reattach=False
+                    bdev_names=node_bdev_names, reattach=reattach,
             )
             remote_devices.append(dev)
 
@@ -1749,7 +1752,7 @@ def restart_storage_node(
     # for node in snodes:
     #     if node.get_id() == snode.get_id() or node.status != StorageNode.STATUS_ONLINE:
     #         continue
-    #     node.remote_devices = _connect_to_remote_devs(node, force_conect_restarting_nodes=True)
+    #     node.remote_devices = _connect_to_remote_devs(node, force_connect_restarting_nodes=True)
     #     node.write_to_db(kv_store)
     #
     # logger.info(f"Sending device status event")
@@ -1770,7 +1773,7 @@ def restart_storage_node(
             if node.get_id() == snode.get_id() or node.status != StorageNode.STATUS_ONLINE:
                 continue
             try:
-                node.remote_devices = _connect_to_remote_devs(node, force_conect_restarting_nodes=True)
+                node.remote_devices = _connect_to_remote_devs(node, reattach=True, force_connect_restarting_nodes=True)
             except RuntimeError:
                 logger.error('Failed to connect to remote devices')
                 return False
@@ -1817,7 +1820,7 @@ def restart_storage_node(
                     continue
 
                 try:
-                    node.remote_devices = _connect_to_remote_devs(node, force_conect_restarting_nodes=True)
+                    node.remote_devices = _connect_to_remote_devs(node, force_connect_restarting_nodes=True)
                 except RuntimeError:
                     logger.error('Failed to connect to remote devices')
                     return False
@@ -2895,7 +2898,7 @@ def recreate_lvstore_on_sec(secondary_node):
         ### 2- create lvols nvmf subsystems
         for lvol in lvol_list:
             logger.info("creating subsystem %s", lvol.nqn)
-            secondary_rpc_client.subsystem_create(lvol.nqn, 'sbcli-cn', lvol.uuid, 1000,
+            secondary_rpc_client.subsystem_create(lvol.nqn, lvol.ha_type, lvol.uuid, 1000,
                                                   max_namespaces=constants.LVO_MAX_NAMESPACES_PER_SUBSYS)
 
         if primary_node.status in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_RESTARTING]:
@@ -2987,7 +2990,7 @@ def recreate_lvstore(snode, force=False):
     ### 2- create lvols nvmf subsystems
     for lvol in lvol_list:
         logger.info("creating subsystem %s", lvol.nqn)
-        rpc_client.subsystem_create(lvol.nqn, 'sbcli-cn', lvol.uuid, 1,
+        rpc_client.subsystem_create(lvol.nqn, lvol.ha_type, lvol.uuid, 1,
                                     max_namespaces=constants.LVO_MAX_NAMESPACES_PER_SUBSYS)
 
     if sec_node:

sbcli_dev-19.2.6/simplyblock_core/scripts/datasource.yml

@@ -1,20 +0,0 @@
-apiVersion: 1
-datasources:
-- name: Thanos
-  type: prometheus
-  url: http://thanos-query:9091
-  isDefault: true
-  access: proxy
-  uid: PBFA97CFB590B2093
-  editable: true
-- name: GRAYLOG
-  type: elasticsearch
-  url: http://opensearch:9200
-  isDefault: false
-  access: proxy
-  uid: graylog_uid
-  editable: true
-  jsonData:
-    index: '*'
-    interval: Hourly
-    timeField: 'timestamp'