sbcli-dev 3.8.87__zip → 3.8.89__zip

{sbcli_dev-3.8.87 → sbcli_dev-3.8.89}/PKG-INFO

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

{sbcli_dev-3.8.87 → sbcli_dev-3.8.89}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=3.8.87
+SIMPLY_BLOCK_VERSION=3.8.89
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main

{sbcli_dev-3.8.87 → sbcli_dev-3.8.89}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.87 → sbcli_dev-3.8.89}/simplyblock_cli/cli.py

@@ -285,6 +285,7 @@ class CLIWrapper:
                                  default=4096)
         sub_command.add_argument("--ha-type", help='LVol HA type (single, ha), default is cluster HA type',
                                  dest='ha_type', choices=["single", "ha", "default"], default='single')
+        sub_command.add_argument("--enable-node-affinity", help='Enable node affinity for storage nodes', action='store_true')
 
         # add cluster
         sub_command = self.add_sub_command(subparser, 'add', 'Add new cluster')
@@ -306,6 +307,7 @@ class CLIWrapper:
                                  default=4096)
         sub_command.add_argument("--ha-type", help='LVol HA type (single, ha), default is cluster HA type',
                                  dest='ha_type', choices=["single", "ha", "default"], default='default')
+        sub_command.add_argument("--enable-node-affinity", help='Enable node affinity for storage nodes', action='store_true')
 
         # Activate cluster
         sub_command = self.add_sub_command(subparser, 'activate', 'Create distribs and raid0 bdevs on all the storage node and move the cluster to active state')
@@ -1234,10 +1236,11 @@ class CLIWrapper:
         distr_bs = args.distr_bs
         distr_chunk_bs = args.distr_chunk_bs
         ha_type = args.ha_type
+        enable_node_affinity = args.enable_node_affinity
 
         return cluster_ops.add_cluster(
             blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit,
-            distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type)
+            distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type, enable_node_affinity)
 
     def cluster_create(self, args):
         page_size_in_blocks = args.page_size
@@ -1257,12 +1260,13 @@ class CLIWrapper:
         metrics_retention_period = args.metrics_retention_period
         contact_point = args.contact_point
         grafana_endpoint = args.grafana_endpoint
+        enable_node_affinity = args.enable_node_affinity
 
         return cluster_ops.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, contact_point, grafana_endpoint,
-            distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type)
+            distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type, enable_node_affinity)
 
     def query_yes_no(self, question, default="yes"):
         """Ask a yes/no question via raw_input() and return their answer.

{sbcli_dev-3.8.87 → sbcli_dev-3.8.89}/simplyblock_core/cluster_ops.py

@@ -108,7 +108,7 @@ def _add_graylog_input(cluster_ip, password):
 
 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,
-                   contact_point, grafana_endpoint, distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type):
+                   contact_point, grafana_endpoint, distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type, enable_node_affinity):
     logger.info("Installing dependencies...")
     ret = scripts.install_deps()
     logger.info("Installing dependencies > Done")
@@ -171,6 +171,7 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
     c.distr_chunk_bs = distr_chunk_bs
     c.ha_type = ha_type
     c.grafana_endpoint = grafana_endpoint
+    c.enable_node_affinity = enable_node_affinity
     
     alerts_template_folder = os.path.join(TOP_DIR, "simplyblock_core/scripts/alerting/")
     alert_resources_file = "alert_resources.yaml"
@@ -288,7 +289,7 @@ def deploy_spdk(node_docker, spdk_cpu_mask, spdk_mem):
 
 
 def add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit,
-                distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type):
+                distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type, enable_node_affinity):
     db_controller = DBController()
     clusters = db_controller.get_clusters()
     if not clusters:
@@ -319,6 +320,7 @@ def add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn
     cluster.distr_bs = distr_bs
     cluster.distr_chunk_bs = distr_chunk_bs
     cluster.ha_type = ha_type
+    cluster.enable_node_affinity = enable_node_affinity
     if cap_warn and cap_warn > 0:
         cluster.cap_warn = cap_warn
     if cap_crit and cap_crit > 0:

{sbcli_dev-3.8.87 → sbcli_dev-3.8.89}/simplyblock_core/distr_controller.py

@@ -75,6 +75,8 @@ def get_distr_cluster_map(snodes, target_node):
     map_cluster = {}
     map_prob = []
     local_node_index = 0
+    db_controller = DBController()
+    cluster = db_controller.get_cluster_by_id(target_node.cluster_id)
     for index, snode in enumerate(snodes):
         dev_map = {}
         dev_w_map = []
@@ -122,9 +124,10 @@ def get_distr_cluster_map(snodes, target_node):
         "UUID_node_target": "",
         "timestamp": datetime.datetime.now().isoformat("T", "seconds")+'Z',
         "map_cluster": map_cluster,
-        "map_prob": map_prob,
-        'ppln1': local_node_index
+        "map_prob": map_prob
     }
+    if cluster.enable_node_affinity:
+        cl_map['ppln1'] = local_node_index
     return cl_map
 
 

{sbcli_dev-3.8.87 → sbcli_dev-3.8.89}/simplyblock_core/models/cluster.py

@@ -53,7 +53,8 @@ class Cluster(BaseModel):
         "secret": {"type": str, "default": ""},
         "status": {"type": str, "default": ""},
         "updated_at": {"type": str, "default": ""},
-        "grafana_endpoint": {"type": str, "default": ""}
+        "grafana_endpoint": {"type": str, "default": ""},
+        "enable_node_affinity": {"type": bool, 'default': False},
     }
 
     def __init__(self, data=None):

{sbcli_dev-3.8.87 → sbcli_dev-3.8.89}/simplyblock_core/services/cap_monitor.py

@@ -27,7 +27,7 @@ while True:
         size_prov = records[0].size_prov_util
         logger.debug(f"cluster abs util: {size_util}, prov util: {size_prov}")
         if cl.cap_crit:
-            if cl.cap_crit < size_util:
+            if cl.cap_crit <= size_util:
                 logger.warning(f"Cluster absolute cap critical, util: {size_util}% of cluster util: {cl.cap_crit}, "
                                f"putting the cluster in read_only mode")
                 cluster_events.cluster_cap_crit(cl, size_util)

{sbcli_dev-3.8.87 → sbcli_dev-3.8.89}/simplyblock_core/storage_node_ops.py

@@ -879,6 +879,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     alceml_cpu_index = 0
     alceml_worker_cpu_index = 0
     distrib_cpu_index = 0
+    jc_singleton_mask = ""
 
 
     poller_cpu_cores = []

{sbcli_dev-3.8.87 → sbcli_dev-3.8.89}/simplyblock_web/blueprints/web_api_cluster.py

@@ -30,6 +30,7 @@ def add_cluster():
     prov_cap_warn = 0
     prov_cap_crit = 0
 
+
     cl_data = request.get_json()
     if 'blk_size' in cl_data:
         if cl_data['blk_size'] not in [512, 4096]:
@@ -44,9 +45,10 @@ def add_cluster():
     distr_bs = cl_data.get('distr_bs', 4096)
     distr_chunk_bs = cl_data.get('distr_chunk_bs', 4096)
     ha_type = cl_data.get('ha_type', 'single')
+    enable_node_affinity = cl_data.get('enable_node_affinity', False)
 
     ret = cluster_ops.add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn, prov_cap_crit,
-                                  distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type)
+                                  distr_ndcs, distr_npcs, distr_bs, distr_chunk_bs, ha_type, enable_node_affinity)
 
     return utils.get_response(ret)