sbcli-dev 12.1.1__tar.gz → 12.2.0__tar.gz

{sbcli_dev-12.1.1 → sbcli_dev-12.2.0}/PKG-INFO

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

{sbcli_dev-12.1.1 → sbcli_dev-12.2.0}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-12.1.1 → sbcli_dev-12.2.0}/simplyblock_core/cluster_ops.py

@@ -107,6 +107,37 @@ def _add_graylog_input(cluster_ip, password):
     logger.debug(response.text)
     return response.status_code == 201
 
+def _set_max_result_window(cluster_ip, max_window=100000):
+    url_existing_indices = f"http://{cluster_ip}:9200/_all/_settings"
+    payload_existing = json.dumps({
+        "settings": {
+            "index.max_result_window": max_window
+        }
+    })
+    headers = {
+        'Content-Type': 'application/json',
+    }
+    response = requests.put(url_existing_indices, headers=headers, data=payload_existing)
+    if response.status_code == 200:
+        logger.info("Settings updated for existing indices.")
+    else:
+        logger.error(f"Failed to update settings for existing indices: {response.text}")
+        return False
+    
+    url_template = f"http://{cluster_ip}:9200/_template/all_indices_template"
+    payload_template = json.dumps({
+        "index_patterns": ["*"],
+        "settings": {
+            "index.max_result_window": max_window
+        }
+    })
+    response_template = requests.put(url_template, headers=headers, data=payload_template)
+    if response_template.status_code == 200:
+        logger.info("Template created for future indices.")
+        return True
+    else:
+        logger.error(f"Failed to create template for future indices: {response_template.text}")
+        return False
 
 def create_cluster(blk_size, page_size_in_blocks, cli_pass,
                    cap_warn, cap_crit, prov_cap_warn, prov_cap_crit, ifname, log_del_interval, metrics_retention_period,
@@ -244,6 +275,8 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
     out = scripts.set_db_config_single()
     logger.info("Configuring DB > Done")
 
+    _set_max_result_window(DEV_IP)
+
     _add_graylog_input(DEV_IP, c.secret)
 
     _create_update_user(c.uuid, c.grafana_endpoint, c.grafana_secret, c.secret)

{sbcli_dev-12.1.1 → sbcli_dev-12.2.0}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=12.1.1
+SIMPLY_BLOCK_VERSION=12.2.0
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 DOCKER_USER=hamdysimplyblock

{sbcli_dev-12.1.1 → sbcli_dev-12.2.0}/simplyblock_core/rpc_client.py

@@ -140,7 +140,7 @@ class RPCClient:
             "max_io_qpairs_per_ctrlr": qpair_count,
             "max_queue_depth": 512,
             "abort_timeout_sec": 5,
-            "ack_timeout": 512,
+            "ack_timeout": 2048,
             "zcopy": True,
             "in_capsule_data_size": 4096,
             "max_io_size": 131072,
@@ -480,7 +480,8 @@ class RPCClient:
             "name": name,
             "raid_level": raid_level,
             "strip_size_kb": strip_size_kb,
-            "base_bdevs": bdevs_list
+            "base_bdevs": bdevs_list,
+            "io_unmap_limit": 100
         }
         if raid_level == "1":
             params["strip_size_kb"] = 0
@@ -595,12 +596,12 @@ class RPCClient:
         params = {
             # "action_on_timeout": "abort",
             "bdev_retry_count": 0,
-            "transport_retry_count": 0,
+            "transport_retry_count": 5,
             "ctrlr_loss_timeout_sec": 1,
             "fast_io_fail_timeout_sec": 0,
             "reconnect_delay_sec": 1,
             "keep_alive_timeout_ms": 10000,
-            "transport_ack_timeout": 9,
+            "transport_ack_timeout": 10,
             "timeout_us": constants.NVME_TIMEOUT_US
         }
         return self._request("bdev_nvme_set_options", params)

{sbcli_dev-12.1.1 → sbcli_dev-12.2.0}/simplyblock_core/scripts/docker-compose-swarm.yml

@@ -141,6 +141,7 @@ services:
     ports:
       - 80:80
       - 12202:12202
+      - 9200:9200
     networks:
       - localnet
       - monitoring-net

{sbcli_dev-12.1.1 → sbcli_dev-12.2.0}/simplyblock_core/scripts/haproxy.cfg

@@ -65,6 +65,10 @@ backend graylog_input_services
     balance roundrobin
     server-template graylog_input- 1 graylog:12201 check resolvers docker init-addr libc,none
 
+backend opensearch_services
+    balance roundrobin
+    server-template opensearch- 1 opensearch:9200 check resolvers docker init-addr libc,none
+
 
 frontend web_api_front
     bind *:80
@@ -79,3 +83,7 @@ frontend graylog_input_front
     bind *:12202
     mode tcp
     default_backend graylog_input_services
+
+frontend opensearch_front
+    bind *:9200
+    default_backend opensearch_services

{sbcli_dev-12.1.1 → sbcli_dev-12.2.0}/simplyblock_core/scripts/install_deps.sh

@@ -25,4 +25,6 @@ sudo sysctl -w vm.max_map_count=262144
 sudo mkdir -p /etc/simplyblock
 sudo chmod 777 /etc/simplyblock
 
-sudo sh -c 'echo 1 >  /proc/sys/vm/drop_caches'
+sudo sh -c 'echo 1 >  /proc/sys/vm/drop_caches'
+
+sudo sed -i 's/ProcessSizeMax=.*/ProcessSizeMax=5G/' /etc/systemd/coredump.conf

{sbcli_dev-12.1.1 → sbcli_dev-12.2.0}/simplyblock_core/services/storage_node_monitor.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 
 from simplyblock_core import constants, db_controller, cluster_ops, storage_node_ops, utils
 from simplyblock_core.controllers import health_controller, device_controller, tasks_controller
@@ -138,7 +138,7 @@ def update_cluster_status(cluster_id):
                 break
 
             if node.online_since:
-                diff = datetime.now() - datetime.fromisoformat(node.online_since)
+                diff = datetime.now(timezone.utc) - datetime.fromisoformat(node.online_since)
                 if diff.total_seconds() < 60:
                     can_activate = False
                     break

{sbcli_dev-12.1.1 → sbcli_dev-12.2.0}/simplyblock_core/services/tasks_runner_migration.py

@@ -91,9 +91,9 @@ def task_runner(task):
         if not rsp:
             logger.error(f"Failed to start device migration task, storage_ID: {device.cluster_device_order}")
             task.function_result = "Failed to start device migration task"
-            task.retry += 1
+            task.status = JobSchedule.STATUS_DONE
             task.write_to_db(db_controller.kv_store)
-            return False
+            return True
         task.function_params['migration'] = {
             "name": distr_name}
         task.write_to_db(db_controller.kv_store)

{sbcli_dev-12.1.1 → sbcli_dev-12.2.0}/simplyblock_web/blueprints/web_api_lvol.py

@@ -38,7 +38,7 @@ def list_lvols(uuid):
     data = []
     for lvol in lvols:
         tmp = lvol.get_clean_dict()
-        tmp['pool_name'] = db_controller.get_pool_by_id(lvol.pool_uuid).pool_name
+        tmp['pool_name'] = lvol.pool_uuid
         # records_list = lvol_controller.get_io_stats(lvol.get_id(), history=None, parse_sizes=False)
         # records_list = False
         # if records_list: