sbcli-dev 5.1.9__tar.gz → 5.2.1__tar.gz

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/PKG-INFO

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

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/env_var

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

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/simplyblock_cli/cli.py

@@ -277,8 +277,8 @@ class CLIWrapper:
         sub_command.add_argument("--prov-cap-crit", help='Capacity critical level in percent, default=190',
                                  type=int, required=False, dest="prov_cap_crit")
         sub_command.add_argument("--ifname", help='Management interface name, default: eth0')
-        sub_command.add_argument("--log-del-interval", help='graylog deletion interval, default: 7d',
-                                 dest='log_del_interval', default='7d')
+        sub_command.add_argument("--log-del-interval", help='graylog deletion interval, default: 2d',
+                                 dest='log_del_interval', default='2d')
         sub_command.add_argument("--metrics-retention-period", help='retention period for prometheus metrics, default: 7d',
                                  dest='metrics_retention_period', default='7d')
         sub_command.add_argument("--contact-point", help='the email or slack webhook url to be used for alerting',

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/simplyblock_core/cluster_ops.py

@@ -295,7 +295,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, enable_node_affinity, qpair_count,
-                enable_qos):
+                max_queue_size, inflight_io_threshold, enable_qos):
     db_controller = DBController()
     clusters = db_controller.get_clusters()
     if not clusters:
@@ -328,6 +328,8 @@ def add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn
     cluster.ha_type = ha_type
     cluster.enable_node_affinity = enable_node_affinity
     cluster.qpair_count = qpair_count or 256
+    cluster.max_queue_size = max_queue_size
+    cluster.inflight_io_threshold = inflight_io_threshold
     cluster.enable_qos = enable_qos
     if cap_warn and cap_warn > 0:
         cluster.cap_warn = cap_warn

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/simplyblock_core/controllers/lvol_controller.py

@@ -196,7 +196,7 @@ def _get_next_3_nodes(cluster_id, lvol_size=0):
 
             node_stats[node.get_id()] = node_st
 
-    if len(online_nodes) < 3:
+    if len(online_nodes) <= 1:
         return online_nodes
     cluster_stats = utils.dict_agg([node_stats[k] for k in node_stats])
 

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/simplyblock_core/services/health_check_service.py

@@ -115,10 +115,11 @@ while True:
                             connected_devices.append(remote_device.get_id())
                         else:
                             logger.info(f"Checking bdev: {remote_device.remote_bdev} ... not found")
-                            ret = rpc_client.bdev_nvme_detach_controller(remote_device.remote_bdev)
+                            name = f"remote_{remote_device.alceml_bdev}"
+                            ret = rpc_client.bdev_nvme_detach_controller(name)
                             time.sleep(1)
                             ret = rpc_client.bdev_nvme_attach_controller_tcp(
-                                remote_device.remote_bdev, remote_device.nvmf_nqn, remote_device.nvmf_ip, remote_device.nvmf_port)
+                                name, remote_device.nvmf_nqn, remote_device.nvmf_ip, remote_device.nvmf_port)
                             if ret:
                                 logger.info(f"Successfully connected to device: {remote_device.get_id()}")
                                 connected_devices.append(remote_device.get_id())
@@ -170,8 +171,9 @@ while True:
                             logger.info(f"Checking bdev: {remote_device.remote_bdev} ... ok")
                         else:
                             logger.info(f"Checking bdev: {remote_device.remote_bdev} ... not found")
+                            name = f"remote_{remote_device.alceml_bdev}"
                             ret = rpc_client.bdev_nvme_attach_controller_tcp(
-                                remote_device.remote_bdev, remote_device.nvmf_nqn, remote_device.nvmf_ip,
+                                name, remote_device.nvmf_nqn, remote_device.nvmf_ip,
                                 remote_device.nvmf_port)
                             if ret:
                                 logger.info(f"Successfully connected to device: {remote_device.get_id()}")

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/simplyblock_core/services/spdk_http_proxy_server.py

@@ -18,7 +18,7 @@ logger_handler = logging.StreamHandler(stream=sys.stdout)
 logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
 logger = logging.getLogger()
 logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
+logger.setLevel(logging.INFO)
 
 
 def get_env_var(name, default=None, is_required=False):

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/simplyblock_core/snode_client.py

@@ -16,7 +16,7 @@ class SNodeClientException(Exception):
 
 class SNodeClient:
 
-    def __init__(self, ip_address, timeout=60, retry=5):
+    def __init__(self, ip_address, timeout=120, retry=5):
         self.ip_address = ip_address
         self.url = 'http://%s/snode/' % self.ip_address
         self.timeout = timeout

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/simplyblock_web/blueprints/snode_ops_k8s.py

@@ -19,7 +19,7 @@ from simplyblock_web import utils, node_utils
 from simplyblock_core import scripts, constants, shell_utils
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
+logger.setLevel(logging.INFO)
 bp = Blueprint("snode", __name__, url_prefix="/snode")
 
 cluster_id_file = "/etc/foundationdb/sbcli_cluster_id"

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/simplyblock_web/blueprints/web_api_cluster.py

@@ -49,10 +49,11 @@ def add_cluster():
 
     max_queue_size = cl_data.get('max_queue_size', 128)
     inflight_io_threshold = cl_data.get('inflight_io_threshold', 4)
+    enable_qos = cl_data.get('enable_qos', 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, enable_node_affinity,
-                                  qpair_count, max_queue_size, inflight_io_threshold)
+                                  qpair_count, max_queue_size, inflight_io_threshold, enable_qos)
 
     return utils.get_response(ret)
 

{sbcli_dev-5.1.9 → sbcli_dev-5.2.1}/simplyblock_web/snode_app_k8s.py

@@ -12,7 +12,7 @@ logger_handler = logging.StreamHandler()
 logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
 logger = logging.getLogger()
 logger.addHandler(logger_handler)
-logger.setLevel(logging.DEBUG)
+logger.setLevel(logging.INFO)
 
 
 app = Flask(__name__)
@@ -29,4 +29,4 @@ app.register_blueprint(snode_ops_k8s.bp)
 app.config['JSONIFY_PRETTYPRINT_REGULAR'] = True
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', debug=constants.LOG_WEB_DEBUG)
+    app.run(host='0.0.0.0')