sbcli-dev 10.7.4__tar.gz → 10.7.6__tar.gz

{sbcli_dev-10.7.4 → sbcli_dev-10.7.6}/PKG-INFO

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

{sbcli_dev-10.7.4 → sbcli_dev-10.7.6}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.7.4 → sbcli_dev-10.7.6}/simplyblock_core/cluster_ops.py

@@ -541,7 +541,16 @@ def get_capacity(cluster_id, history, records_count=20, is_json=False):
 
     records = db_controller.get_cluster_capacity(cluster, records_number)
 
-    new_records = utils.process_records(records, records_count)
+    cap_stats_keys = [
+        "date",
+        "size_total",
+        "size_prov",
+        "size_used",
+        "size_free",
+        "size_util",
+        "size_prov_util",
+    ]
+    new_records = utils.process_records(records, records_count, keys=cap_stats_keys)
 
     if is_json:
         return json.dumps(new_records, indent=2)
@@ -582,8 +591,17 @@ def get_iostats_history(cluster_id, history_string, records_count=20, parse_size
 
     records = db_controller.get_cluster_stats(cluster, records_number)
 
+    io_stats_keys = [
+        "date",
+        "read_bytes_ps",
+        "read_io_ps",
+        "read_latency_ps",
+        "write_bytes_ps",
+        "write_io_ps",
+        "write_latency_ps",
+    ]
     # combine records
-    new_records = utils.process_records(records, records_count)
+    new_records = utils.process_records(records, records_count, keys=io_stats_keys)
 
     if not parse_sizes:
         return new_records

{sbcli_dev-10.7.4 → sbcli_dev-10.7.6}/simplyblock_core/controllers/device_controller.py

@@ -432,7 +432,14 @@ def get_device_capacity(device_id, history, records_count=20, parse_sizes=True):
         records_number = 20
 
     records = db_controller.get_device_capacity(device, records_number)
-    records_list = utils.process_records(records, records_count)
+    cap_stats_keys = [
+        "date",
+        "size_total",
+        "size_used",
+        "size_free",
+        "size_util",
+    ]
+    records_list = utils.process_records(records, records_count, keys=cap_stats_keys)
 
     if not parse_sizes:
         return records_list
@@ -466,7 +473,17 @@ def get_device_iostats(device_id, history, records_count=20, parse_sizes=True):
         records_number = 20
 
     records_list = db_controller.get_device_stats(device, records_number)
-    new_records = utils.process_records(records_list, records_count)
+    io_stats_keys = [
+        "date",
+        "read_bytes_ps",
+        "read_io_ps",
+        "read_latency_ps",
+        "write_bytes_ps",
+        "write_io_ps",
+        "write_latency_ps",
+    ]
+    # combine records
+    new_records = utils.process_records(records_list, records_count, keys=io_stats_keys)
 
     if not parse_sizes:
         return new_records

{sbcli_dev-10.7.4 → sbcli_dev-10.7.6}/simplyblock_core/controllers/lvol_controller.py

@@ -1222,7 +1222,14 @@ def get_capacity(lvol_uuid, history, records_count=20, parse_sizes=True):
     records_list = db_controller.get_lvol_stats(lvol, limit=records_number)
     if not records_list:
         return False
-    new_records = utils.process_records(records_list, min(records_count, len(records_list)))
+    cap_stats_keys = [
+        "date",
+        "size_total",
+        "size_used",
+        "size_free",
+        "size_util",
+    ]
+    new_records = utils.process_records(records_list, records_count, keys=cap_stats_keys)
 
     if not parse_sizes:
         return new_records
@@ -1256,7 +1263,20 @@ def get_io_stats(lvol_uuid, history, records_count=20, parse_sizes=True):
     records_list = db_controller.get_lvol_stats(lvol, limit=records_number)
     if not records_list:
         return False
-    new_records = utils.process_records(records_list, min(records_count, len(records_list)))
+    io_stats_keys = [
+        "date",
+        "read_bytes",
+        "read_bytes_ps",
+        "read_io_ps",
+        "read_latency_ps",
+        "write_bytes",
+        "write_bytes_ps",
+        "write_io_ps",
+        "write_latency_ps",
+        "connected_clients",
+    ]
+    # combine records
+    new_records = utils.process_records(records_list, records_count, keys=io_stats_keys)
 
     if not parse_sizes:
         return new_records

{sbcli_dev-10.7.4 → sbcli_dev-10.7.6}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=10.7.4
+SIMPLY_BLOCK_VERSION=10.7.6
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 DOCKER_USER=hamdysimplyblock

{sbcli_dev-10.7.4 → sbcli_dev-10.7.6}/simplyblock_core/storage_node_ops.py

@@ -1864,7 +1864,7 @@ def restart_storage_node(
                 snode.nvme_devices.append(dev)
 
         snode.write_to_db(db_controller.kv_store)
-        if node_ip:
+        if node_ip and len(new_devices)>0:
             # prepare devices on new node
             if snode.num_partitions_per_dev == 0 or snode.jm_percent == 0:
 
@@ -2365,7 +2365,16 @@ def get_node_capacity(node_id, history, records_count=20, parse_sizes=True):
         records_number = 20
 
     records = db_controller.get_node_capacity(this_node, records_number)
-    new_records = utils.process_records(records, records_count)
+    cap_stats_keys = [
+        "date",
+        "size_total",
+        "size_prov",
+        "size_used",
+        "size_free",
+        "size_util",
+        "size_prov_util",
+    ]
+    new_records = utils.process_records(records, records_count, keys=cap_stats_keys)
 
     if not parse_sizes:
         return new_records
@@ -2400,7 +2409,18 @@ def get_node_iostats_history(node_id, history, records_count=20, parse_sizes=Tru
         records_number = 20
 
     records = db_controller.get_node_stats(node, records_number)
-    new_records = utils.process_records(records, records_count)
+
+    io_stats_keys = [
+        "date",
+        "read_bytes_ps",
+        "read_io_ps",
+        "read_latency_ps",
+        "write_bytes_ps",
+        "write_io_ps",
+        "write_latency_ps",
+    ]
+    # combine records
+    new_records = utils.process_records(records, records_count, keys=io_stats_keys)
 
     if not parse_sizes:
         return new_records

{sbcli_dev-10.7.4 → sbcli_dev-10.7.6}/simplyblock_core/utils.py

@@ -143,10 +143,12 @@ def get_docker_client(cluster_id=None):
     return False
 
 
-def dict_agg(data, mean=False):
+def dict_agg(data, mean=False, keys=None):
     out = {}
+    if not keys and data:
+        keys = data[0].keys()
     for d in data:
-        for key in d.keys():
+        for key in keys:
             if isinstance(d[key], int) or isinstance(d[key], float):
                 if key in out:
                     out[key] += d[key]
@@ -249,11 +251,11 @@ def parse_history_param(history_string):
         if ind == 'm':
             history_in_seconds += v * 60
 
-    records_number = int(history_in_seconds/2)
+    records_number = int(history_in_seconds/5)
     return records_number
 
 
-def process_records(records, records_count):
+def process_records(records, records_count, keys=None):
     # combine records
     if not records:
         return []
@@ -267,7 +269,7 @@ def process_records(records, records_count):
         last_index = (i + 1) * data_per_record
         last_index = min(last_index, len(records))
         sl = records[first_index:last_index]
-        rec = dict_agg(sl, mean=True)
+        rec = dict_agg(sl, mean=True, keys=keys)
         new_records.append(rec)
     return new_records