sbcli-dev 15.0.2__tar.gz → 16.0.0__tar.gz

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/PKG-INFO

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

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/sbcli_dev.egg-info/SOURCES.txt

@@ -113,6 +113,7 @@ simplyblock_core/services/tasks_runner_node_add.py
 simplyblock_core/services/tasks_runner_restart.py
 simplyblock_core/services/spdk/__init__.py
 simplyblock_core/services/spdk/client.py
+simplyblock_core/test/test_utils.py
 simplyblock_core/workers/cleanup_foundationdb.py
 simplyblock_web/README.md
 simplyblock_web/__init__.py
@@ -121,6 +122,7 @@ simplyblock_web/auth_middleware.py
 simplyblock_web/caching_node_app.py
 simplyblock_web/caching_node_app_k8s.py
 simplyblock_web/node_utils.py
+simplyblock_web/node_utils_k8s.py
 simplyblock_web/node_webapp.py
 simplyblock_web/requirements.txt
 simplyblock_web/snode_app.py
@@ -134,6 +136,7 @@ simplyblock_web/blueprints/node_api_caching_docker.py
 simplyblock_web/blueprints/node_api_caching_ks.py
 simplyblock_web/blueprints/snode_ops.py
 simplyblock_web/blueprints/snode_ops_k8s.py
+simplyblock_web/blueprints/swagger_ui_blueprint.py
 simplyblock_web/blueprints/web_api_caching_node.py
 simplyblock_web/blueprints/web_api_cluster.py
 simplyblock_web/blueprints/web_api_deployer.py
@@ -143,6 +146,7 @@ simplyblock_web/blueprints/web_api_mgmt_node.py
 simplyblock_web/blueprints/web_api_pool.py
 simplyblock_web/blueprints/web_api_snapshot.py
 simplyblock_web/blueprints/web_api_storage_node.py
+simplyblock_web/static/SimplyBlock-API.postman_collection.json
 simplyblock_web/static/delete.py
 simplyblock_web/static/deploy.py
 simplyblock_web/static/deploy_cnode.yaml
@@ -150,6 +154,7 @@ simplyblock_web/static/deploy_spdk.yaml
 simplyblock_web/static/is_up.py
 simplyblock_web/static/list_deps.py
 simplyblock_web/static/rpac.yaml
+simplyblock_web/static/swagger.yaml
 simplyblock_web/static/tst.py
 simplyblock_web/templates/caching_deploy_spdk.yaml.j2
 simplyblock_web/templates/storage_deploy_spdk.yaml.j2

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/simplyblock_cli/cli.py

@@ -68,8 +68,7 @@ class CLIWrapper(CLIWrapperBase):
             self.init_storage_node__send_cluster_map(subparser)
         if self.developer_mode:
             self.init_storage_node__get_cluster_map(subparser)
-        if self.developer_mode:
-            self.init_storage_node__make_primary(subparser)
+        self.init_storage_node__make_primary(subparser)
         if self.developer_mode:
             self.init_storage_node__dump_lvstore(subparser)
         if self.developer_mode:
@@ -149,8 +148,8 @@ class CLIWrapper(CLIWrapperBase):
         if self.developer_mode:
             argument = subcommand.add_argument('--max-snap', help='Max snapshot per storage node', type=int, default=5000, dest='max_snap', required=False)
         if self.developer_mode:
-            argument = subcommand.add_argument('--max-size', help='Maximum amount of GB to be utilized on this storage node', type=str, default='', dest='max_prov', required=False)
-        argument = subcommand.add_argument('--node-ip', help='Restart Node on new node', type=str, dest='node_ip', required=False)
+            argument = subcommand.add_argument('--max-size', help='Maximum amount of GB to be utilized on this storage node', type=str, default='0', dest='max_prov', required=False)
+        argument = subcommand.add_argument('--node-addr', '--node-ip', help='Restart Node on new node', type=str, dest='node_ip', required=False)
         argument = subcommand.add_argument('--number-of-devices', help='Number of devices per storage node if it\'s not supported EC2 instance', type=int, dest='number_of_devices', required=False)
         if self.developer_mode:
             argument = subcommand.add_argument('--spdk-image', help='SPDK image uri', type=str, dest='spdk_image', required=False)
@@ -277,7 +276,7 @@ class CLIWrapper(CLIWrapperBase):
         subcommand.add_argument('node_id', help='Storage node id', type=str).completer = self._completer_get_sn_list
 
     def init_storage_node__make_primary(self, subparser):
-        subcommand = self.add_sub_command(subparser, 'make-primary', 'In case of HA SNode, makes the current node as primary')
+        subcommand = self.add_sub_command(subparser, 'make-primary', 'Forces to make the provided node id primary')
         subcommand.add_argument('node_id', help='Storage node id', type=str).completer = self._completer_get_sn_list
 
     def init_storage_node__dump_lvstore(self, subparser):
@@ -315,6 +314,8 @@ class CLIWrapper(CLIWrapperBase):
         self.init_cluster__list_tasks(subparser)
         self.init_cluster__cancel_task(subparser)
         self.init_cluster__delete(subparser)
+        if self.developer_mode:
+            self.init_cluster__set(subparser)
 
 
     def init_cluster__deploy(self, subparser):
@@ -556,6 +557,12 @@ class CLIWrapper(CLIWrapperBase):
         subcommand = self.add_sub_command(subparser, 'delete', 'Deletes a cluster')
         subcommand.add_argument('cluster_id', help='Cluster id', type=str).completer = self._completer_get_cluster_list
 
+    def init_cluster__set(self, subparser):
+        subcommand = self.add_sub_command(subparser, 'set', 'set cluster db value')
+        subcommand.add_argument('cluster_id', help='cluster id', type=str)
+        subcommand.add_argument('attr_name', help='attr_name', type=str)
+        subcommand.add_argument('attr_value', help='attr_value', type=str)
+
 
     def init_volume(self):
         subparser = self.add_command('volume', 'Logical volume commands', aliases=['lvol',])
@@ -600,7 +607,7 @@ class CLIWrapper(CLIWrapperBase):
         argument = subcommand.add_argument('--namespace', help='Set logical volume namespace for k8s clients', type=str, dest='namespace', required=False)
         if self.developer_mode:
             argument = subcommand.add_argument('--uid', help='Set logical volume id', type=str, dest='uid', required=False)
-        argument = subcommand.add_argument('--pvc_name', help='Set logical volume PVC name for k8s clients', type=str, dest='pvc_name', required=False)
+        argument = subcommand.add_argument('--pvc-name', '--pvc_name', help='Set logical volume PVC name for k8s clients', type=str, dest='pvc_name', required=False)
 
     def init_volume__qos_set(self, subparser):
         subcommand = self.add_sub_command(subparser, 'qos-set', 'Changes QoS settings for an active logical volume')
@@ -906,7 +913,7 @@ class CLIWrapper(CLIWrapperBase):
             elif sub_command in ['restart']:
                 if not self.developer_mode:
                     args.max_snap = 5000
-                    args.max_prov = ''
+                    args.max_prov = '0'
                     args.spdk_image = None
                     args.spdk_debug = None
                     args.small_bufsize = 0
@@ -983,11 +990,7 @@ class CLIWrapper(CLIWrapperBase):
                 else:
                     ret = self.storage_node__get_cluster_map(sub_command, args)
             elif sub_command in ['make-primary']:
-                if not self.developer_mode:
-                    print("This command is private.")
-                    ret = False
-                else:
-                    ret = self.storage_node__make_primary(sub_command, args)
+                ret = self.storage_node__make_primary(sub_command, args)
             elif sub_command in ['dump-lvstore']:
                 if not self.developer_mode:
                     print("This command is private.")
@@ -1105,6 +1108,12 @@ class CLIWrapper(CLIWrapperBase):
                 ret = self.cluster__cancel_task(sub_command, args)
             elif sub_command in ['delete']:
                 ret = self.cluster__delete(sub_command, args)
+            elif sub_command in ['set']:
+                if not self.developer_mode:
+                    print("This command is private.")
+                    ret = False
+                else:
+                    ret = self.cluster__set(sub_command, args)
             else:
                 self.parser.print_help()
 

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/simplyblock_cli/clibase.py

@@ -76,7 +76,7 @@ class CLIWrapperBase:
 
         max_lvol = args.max_lvol
         max_snap = args.max_snap
-        max_prov = args.max_prov
+        max_prov = utils.parse_size(args.max_prov, unit='G')
         number_of_devices = args.number_of_devices
         enable_test_device = args.enable_test_device
         enable_ha_jm = args.enable_ha_jm
@@ -132,7 +132,7 @@ class CLIWrapperBase:
 
         max_lvol = args.max_lvol
         max_snap = args.max_snap
-        max_prov = args.max_prov if args.max_prov else 0
+        max_prov = utils.parse_size(args.max_prov, unit='G')
         number_of_devices = args.number_of_devices
 
         small_bufsize = args.small_bufsize
@@ -357,10 +357,14 @@ class CLIWrapperBase:
         cluster_id = args.cluster_id
         return cluster_ops.get_ssh_pass(cluster_id)
 
+    def cluster__set(self, sub_command, args):
+        cluster_id = args.cluster_id
+        return cluster_ops.set(cluster_id,  args.attr_name, args.attr_value)
+
     def volume__add(self, sub_command, args):
         name = args.name
-        size = self.parse_size(args.size)
-        max_size = self.parse_size(args.max_size)
+        size = utils.parse_size(args.size)
+        max_size = utils.parse_size(args.max_size)
         host_id = args.host_id
         ha_type = args.ha_type
         pool = args.pool
@@ -414,7 +418,7 @@ class CLIWrapperBase:
 
     def volume__resize(self, sub_command, args):
         volume_id = args.volume_id
-        size = self.parse_size(args.size)
+        size = utils.parse_size(args.size)
         return lvol_controller.resize_lvol(volume_id, size)
 
     def volume__create_snapshot(self, sub_command, args):
@@ -426,7 +430,7 @@ class CLIWrapperBase:
     def volume__clone(self, sub_command, args):
         new_size = 0
         if args.resize:
-            new_size = self.parse_size(args.resize)
+            new_size = utils.parse_size(args.resize)
 
         clone_id, error = snapshot_controller.clone(args.snapshot_id, args.clone_name, new_size)
         return clone_id if not error else error
@@ -479,8 +483,8 @@ class CLIWrapperBase:
             has_secret = False
         return pool_controller.add_pool(
             args.name,
-            self.parse_size(args.pool_max),
-            self.parse_size(args.lvol_max),
+            utils.parse_size(args.pool_max),
+            utils.parse_size(args.lvol_max),
             args.max_rw_iops,
             args.max_rw_mbytes,
             args.max_r_mbytes,
@@ -493,9 +497,9 @@ class CLIWrapperBase:
         pool_max = None
         lvol_max = None
         if args.pool_max:
-            pool_max = self.parse_size(args.pool_max)
+            pool_max = utils.parse_size(args.pool_max)
         if args.lvol_max:
-            lvol_max = self.parse_size(args.lvol_max)
+            lvol_max = utils.parse_size(args.lvol_max)
         return pool_controller.set_pool(
             args.pool_id,
             pool_max,
@@ -545,7 +549,7 @@ class CLIWrapperBase:
     def snapshot__clone(self, sub_command, args):
         new_size = 0
         if args.resize:
-            new_size = self.parse_size(args.resize)
+            new_size = utils.parse_size(args.resize)
 
         success, details = snapshot_controller.clone(args.snapshot_id, args.lvol_name, new_size)
         return details
@@ -571,9 +575,9 @@ class CLIWrapperBase:
 
         spdk_mem = None
         if args.spdk_mem:
-            spdk_mem = self.parse_size(args.spdk_mem)
-            if spdk_mem < 1 * 1024 * 1024:
-                return f"SPDK memory:{args.spdk_mem} must be larger than 1G"
+            spdk_mem = utils.parse_size(args.spdk_mem)
+            if spdk_mem < utils.parse_size('1GiB'):
+                return f"SPDK memory:{args.spdk_mem} must be larger than 1GiB"
 
         return caching_node_controller.add_node(
             cluster_id, node_ip, ifname, data_nics, spdk_cpu_mask, spdk_mem, spdk_image, namespace, multipathing)
@@ -681,9 +685,11 @@ class CLIWrapperBase:
             else:
                 return f"Invalid cpu mask value: {args.spdk_cpu_mask}"
 
+        
+
         max_lvol = args.max_lvol
         max_snap = args.max_snap
-        max_prov = args.max_prov
+        max_prov = utils.parse_size(args.max_prov, unit='G')
         number_of_devices = args.number_of_devices
         enable_test_device = args.enable_test_device
         enable_ha_jm = args.enable_ha_jm
@@ -692,11 +698,11 @@ class CLIWrapperBase:
         secondary_nodes = args.secondary_nodes
         
         lvol_name = args.lvol_name
-        lvol_size = self.parse_size(args.lvol_size)
-        max_size = self.parse_size(args.max_size)
+        lvol_size = utils.parse_size(args.lvol_size)
+        max_size = utils.parse_size(args.max_size)
         lvol_ha_type = args.lvol_ha_type
         pool_name = args.pool_name
-        pool_max = self.parse_size(args.pool_max)
+        pool_max = utils.parse_size(args.pool_max)
         host_id = args.host_id
         comp = None
         crypto = args.encrypt
@@ -786,39 +792,6 @@ class CLIWrapperBase:
             else:
                 sys.stdout.write("Please respond with 'yes' or 'no' " "(or 'y' or 'n').\n")
 
-    def parse_size(self, size_string: str):
-        try:
-            x = int(size_string)
-            return x
-        except Exception:
-            pass
-        try:
-            if size_string:
-                size_string = size_string.lower()
-                size_string = size_string.replace(" ", "")
-                size_string = size_string.replace("b", "")
-                size_number = int(size_string[:-1])
-                size_v = size_string[-1]
-                one_k = constants.ONE_KB
-                multi = 0
-                if size_v == "k":
-                    multi = 1
-                elif size_v == "m":
-                    multi = 2
-                elif size_v == "g":
-                    multi = 3
-                elif size_v == "t":
-                    multi = 4
-                else:
-                    print(f"Error parsing size: {size_string}")
-                    return -1
-                return size_number * math.pow(one_k, multi)
-            else:
-                return -1
-        except:
-            print(f"Error parsing size: {size_string}")
-            return -1
-
     def validate_cpu_mask(self, spdk_cpu_mask):
         return re.match("^(0x|0X)?[a-fA-F0-9]+$", spdk_cpu_mask)
 

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/simplyblock_core/cluster_ops.py

@@ -591,7 +591,8 @@ def cluster_activate(cl_id, force=False, force_lvstore_create=False):
         if node.status == node.STATUS_ONLINE:
             online_nodes.append(node)
             for dev in node.nvme_devices:
-                if dev.status == dev.STATUS_ONLINE:
+                if dev.status in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_READONLY,
+                                  NVMeDevice.STATUS_CANNOT_ALLOCATE]:
                     dev_count += 1
     minimum_devices = cluster.distr_ndcs + cluster.distr_npcs + 1
     if dev_count < minimum_devices:
@@ -723,20 +724,11 @@ def cluster_set_read_only(cl_id):
         for node in st:
             if node.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_SUSPENDED, StorageNode.STATUS_DOWN]:
                 continue
-
-            rpc_client = RPCClient(
-                node.mgmt_ip, node.rpc_port,
-                node.rpc_username, node.rpc_password, timeout=3, retry=2)
-
-            if node.lvstore:
-                rpc_client.bdev_lvol_set_lvs_read_only(node.lvstore, True)
-                if node.secondary_node_id:
-                    sec_node = db_controller.get_storage_node_by_id(node.secondary_node_id)
-                    if sec_node:
-                        sec_rpc_client = RPCClient(
-                            sec_node.mgmt_ip, sec_node.rpc_port,
-                            sec_node.rpc_username, sec_node.rpc_password, timeout=3, retry=2)
-                        sec_rpc_client.bdev_lvol_set_lvs_read_only(node.lvstore, True)
+            for dev in node.nvme_devices:
+                if dev.status == NVMeDevice.STATUS_ONLINE:
+                    # dev_stat = db_controller.get_device_stats(dev, 1)
+                    # if dev_stat and dev_stat[0].size_util >= cluster.cap_crit:
+                    device_controller.device_set_state(dev.get_id(), NVMeDevice.STATUS_CANNOT_ALLOCATE)
 
     return True
 
@@ -758,19 +750,12 @@ def cluster_set_active(cl_id):
             if node.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_SUSPENDED, StorageNode.STATUS_DOWN]:
                 continue
 
-            rpc_client = RPCClient(
-                node.mgmt_ip, node.rpc_port,
-                node.rpc_username, node.rpc_password, timeout=3, retry=2)
-
-            if node.lvstore:
-                rpc_client.bdev_lvol_set_lvs_read_only(node.lvstore, False)
-                if node.secondary_node_id:
-                    sec_node = db_controller.get_storage_node_by_id(node.secondary_node_id)
-                    if sec_node:
-                        sec_rpc_client = RPCClient(
-                            sec_node.mgmt_ip, sec_node.rpc_port,
-                            sec_node.rpc_username, sec_node.rpc_password, timeout=3, retry=2)
-                        sec_rpc_client.bdev_lvol_set_lvs_read_only(node.lvstore, False)
+            for dev in node.nvme_devices:
+                if dev.status in [NVMeDevice.STATUS_CANNOT_ALLOCATE, NVMeDevice.STATUS_READONLY]:
+                    dev_stat = db_controller.get_device_stats(dev, 1)
+                    if dev_stat and dev_stat[0].size_util < cluster.cap_crit:
+                        device_controller.device_set_online(dev.get_id())
+
     return True
 
 
@@ -1384,48 +1369,20 @@ def open_db_from_zip(fip_path):
 
 
 
-def cluster_reset():
-    """
-
-
-set -x
-
-CMD=$(ls ~/.local/bin/sbcli-* | awk '{n=split($0,a,"/"); print a[n]}')
-cl=$($CMD cluster list | tail -n -3 | awk '{print $2}')
-
-#$CMD cluster graceful-shutdown $cl
-
-for sn_id in $($CMD sn list | grep / | awk '{print $2}'); do
-  $CMD -d sn shutdown --force $sn_id
-done
-
-sudo mv /etc/foundationdb/fdb.cluster /etc/foundationdb/fdb.cluster.bck
-for service_id in $(docker service ls | grep / | awk '{print $1}'); do
-  docker service update "$service_id" --force --detach
-done
-
-# restore
-fdb_cont=$(sudo docker ps | grep "app_fdb-server" | awk '{print $1}')
-sudo docker rm --force $fdb_cont
-sudo rm -rf /etc/foundationdb/data/*
-fdbcli --exec "configure new single ssd ; writemode on ; clearrange \"\" \\xff" -C /etc/foundationdb/fdb.cluster.bck
-BF=$(fdbbackup list -b file:///etc/foundationdb/backup/)
-fdbrestore start -r "$BF" --dest-cluster-file /etc/foundationdb/fdb.cluster.bck -t fresh_deploy
-
-sudo mv /etc/foundationdb/fdb.cluster.bck /etc/foundationdb/fdb.cluster
-
-for service_id in $(docker service ls | grep / | awk '{print $1}'); do
-  docker service update "$service_id" --force --detach
-done
-
-sleep 30
-for sn_id in $($CMD sn list | grep / | awk '{print $2}'); do
-  $CMD -d sn shutdown --force $sn_id
-done
-
-sleep 5
-$CMD -d cluster graceful-startup $cl  --clear-data
+def set(cl_id, attr, value):
+    db_controller = DBController()
+    cluster = db_controller.get_cluster_by_id(cl_id)
+    if not cluster:
+        logger.error(f"Cluster not found {cl_id}")
+        return False
 
-$CMD -d cluster activate $cl
+    if attr in cluster.get_attrs_map():
+        try:
+            value = cluster.get_attrs_map()[attr]['type'](value)
+            logger.info(f"Setting {attr} to {value}")
+            setattr(cluster, attr, value)
+            cluster.write_to_db()
+        except:
+            pass
 
-    """
+    return True

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/simplyblock_core/constants.py

@@ -66,18 +66,16 @@ GRAYLOG_CHECK_INTERVAL_SEC = 60
 
 FDB_CHECK_INTERVAL_SEC = 60
 
+TASK_EXEC_INTERVAL_SEC = 10
+TASK_EXEC_RETRY_COUNT = 8
 
-
+SIMPLY_BLOCK_SPDK_CORE_IMAGE = "simplyblock/spdk-core:v24.05-tag-latest"
 SIMPLY_BLOCK_DOCKER_IMAGE = get_from_env_var_file(
         "SIMPLY_BLOCK_DOCKER_IMAGE","simplyblock/simplyblock:main")
 SIMPLY_BLOCK_CLI_NAME = get_from_env_var_file(
         "SIMPLY_BLOCK_COMMAND_NAME", "sbcli")
-TASK_EXEC_INTERVAL_SEC = 10
-TASK_EXEC_RETRY_COUNT = 8
-SIMPLY_BLOCK_SPDK_CORE_IMAGE = "simplyblock/spdk-core:v24.05-tag-latest"
-
-
-SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:main-latest"
+SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = get_from_env_var_file(
+        "SIMPLY_BLOCK_SPDK_ULTRA_IMAGE", " public.ecr.aws/simply-block/ultra:main-latest")
 
 GELF_PORT = 12202
 
@@ -125,11 +123,11 @@ LVOL_NVME_CONNECT_CTRL_LOSS_TMO=-1
 LVOL_NVME_CONNECT_NR_IO_QUEUES=6
 LVOL_NVME_CONNECT_TIMEOUT_S=10
 LVOL_NVME_KEEP_ALIVE_TO=3
+LVOL_NVMF_PORT_START=9100
 QPAIR_COUNT=32
 NVME_TIMEOUT_US=20000000
 
 NVMF_MAX_SUBSYSTEMS=50000
 HA_JM_COUNT=3
 
-ONE_KB = 1024
 TEMP_CORES_FILE = "/etc/simplyblock/tmp_cores_config"

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/simplyblock_core/controllers/caching_node_controller.py

@@ -135,6 +135,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
     snode.multipathing = multipathing
 
     # check for memory
+    spdk_mem_min = utils.parse_size('1GiB')
     if "memory_details" in node_info and node_info['memory_details']:
         memory_details = node_info['memory_details']
         logger.info("Node Memory info")
@@ -144,13 +145,11 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
         logger.info(f"HP Total: {utils.humanbytes(huge_total)}")
         huge_free = memory_details['huge_free']
         logger.info(f"HP Free: {utils.humanbytes(huge_free)}")
-        # if huge_free < 1 * 1024 * 1024:
-        #     logger.warning(f"Free hugepages are less than 1G: {utils.humanbytes(huge_free)}")
         if not spdk_mem:
-            if huge_total > 1024 * 1024 * 1024:
+            if huge_total > spdk_mem_min:
                 spdk_mem = huge_total
             else:
-                logger.error(f"Free hugepages are less than 1G: {utils.humanbytes(huge_total)}")
+                logger.error(f"Free hugepages are less than {utils.humanbytes(spdk_mem_min)}: {utils.humanbytes(huge_total)}")
                 return False
 
     logger.info(f"Deploying SPDK with HP: {utils.humanbytes(spdk_mem)}")
@@ -204,11 +203,11 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
     snode.write_to_db(db_controller.kv_store)
     ssd_dev = nvme_devs[0]
 
-    if spdk_mem < 1024*1024:
-        logger.error("Hugepages must be larger than 1G")
+    if spdk_mem < spdk_mem_min:
+        logger.error(f"Hugepages must be larger than {utils.humanbytes(spdk_mem_min)}")
         return False
 
-    mem = spdk_mem - 1024*1024*1024
+    mem = spdk_mem - spdk_mem_min
     snode.hugepages = mem
     logger.info(f"Hugepages to be used: {utils.humanbytes(mem)}")
 
@@ -273,7 +272,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
     # create tmp ocf
     logger.info(f"Creating first ocf bdev...")
 
-    ret = rpc_client.bdev_malloc_create("malloc_tmp", 512, int((100*1024*1024)/512))
+    ret = rpc_client.bdev_malloc_create("malloc_tmp", 512, int(utils.parse_size('100MiB')/512))
     if not ret:
         logger.error("Failed ot create tmp malloc")
         return False
@@ -356,7 +355,7 @@ def recreate(node_id):
     # create tmp ocf
     logger.info(f"Creating first ocf bdev...")
 
-    ret = rpc_client.bdev_malloc_create("malloc_tmp", 512, int((100 * 1024 * 1024) / 512))
+    ret = rpc_client.bdev_malloc_create("malloc_tmp", 512, int(utils.parse_size('100MiB') / 512))
     if not ret:
         logger.error("Failed ot create tmp malloc")
         return False

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/simplyblock_core/controllers/cluster_events.py

@@ -30,7 +30,7 @@ def cluster_status_change(cluster, new_state, old_status):
 
 
 def _cluster_cap_event(cluster, msg, event_level):
-    ec.log_event_cluster(
+    return ec.log_event_cluster(
         cluster_id=cluster.get_id(),
         node_id=cluster.get_id(),
         domain=ec.DOMAIN_CLUSTER,
@@ -43,26 +43,26 @@ def _cluster_cap_event(cluster, msg, event_level):
 
 def cluster_cap_warn(cluster, util):
     msg = f"Cluster absolute capacity reached: {util}%"
-    _cluster_cap_event(cluster, msg, event_level=EventObj.LEVEL_WARN)
+    return _cluster_cap_event(cluster, msg, event_level=EventObj.LEVEL_WARN)
 
 
 def cluster_cap_crit(cluster, util):
     msg = f"Cluster absolute capacity reached: {util}%"
-    _cluster_cap_event(cluster, msg, event_level=EventObj.LEVEL_CRITICAL)
+    return _cluster_cap_event(cluster, msg, event_level=EventObj.LEVEL_CRITICAL)
 
 
 def cluster_prov_cap_warn(cluster, util):
     msg = f"Cluster provisioned capacity reached: {util}%"
-    _cluster_cap_event(cluster, msg, event_level=EventObj.LEVEL_WARN)
+    return _cluster_cap_event(cluster, msg, event_level=EventObj.LEVEL_WARN)
 
 
 def cluster_prov_cap_crit(cluster, util):
     msg = f"Cluster provisioned capacity reached: {util}%"
-    _cluster_cap_event(cluster, msg, event_level=EventObj.LEVEL_CRITICAL)
+    return _cluster_cap_event(cluster, msg, event_level=EventObj.LEVEL_CRITICAL)
 
 
 def cluster_delete(cluster):
-    ec.log_event_cluster(
+    return ec.log_event_cluster(
         cluster_id=cluster.get_id(),
         domain=ec.DOMAIN_CLUSTER,
         event=ec.EVENT_OBJ_DELETED,

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/simplyblock_core/controllers/device_controller.py

@@ -658,9 +658,8 @@ def add_device(device_id):
 
     snodes = db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id)
     for node in snodes:
-        if node.status != StorageNode.STATUS_ONLINE:
-            continue
-        distr_controller.send_cluster_map_add_device(device_obj, node)
+        if node.status in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_DOWN]:
+            distr_controller.send_cluster_map_add_device(device_obj, node)
 
     tasks_controller.add_new_device_mig_task(device_id)
     return device_id

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/simplyblock_core/controllers/events_controller.py

@@ -101,6 +101,7 @@ def log_event_cluster(cluster_id, domain, event, db_object, caused_by, message,
 
     db_controller = DBController()
     ds.write_to_db(db_controller.kv_store)
+    return ds.to_dict()
 
 
 def log_event_based_on_level(cluster_id, event, db_object, message, caused_by, event_level):

{sbcli_dev-15.0.2 → sbcli_dev-16.0.0}/simplyblock_core/controllers/lvol_controller.py

@@ -89,7 +89,7 @@ def validate_add_lvol_func(name, size, host_id_or_name, pool_id_or_name,
         return False, "Name can not be empty"
 
     #  size validation
-    if size < 100 * 1024 * 1024:
+    if size < utils.parse_size('100MiB'):
         return False, "Size must be larger than 100M"
 
     #  host validation
@@ -466,7 +466,7 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
         "name": lvol.lvol_bdev,
         "params": {
             "name": lvol.lvol_bdev,
-            "size_in_mib": int(lvol.size / (constants.ONE_KB * constants.ONE_KB)),
+            "size_in_mib": utils.convert_size(lvol.size, 'MiB'),
             "lvs_name": lvol.lvs_name,
             "lvol_priority_class": 0
         }
@@ -1175,8 +1175,6 @@ def resize_lvol(id, new_size):
         logger.error(f"Pool is disabled")
         return False
 
-    new_size = utils.parse_size(new_size)
-
     if lvol.size >= new_size:
         logger.error(f"New size {new_size} must be higher than the original size {lvol.size}")
         return False
@@ -1201,7 +1199,7 @@ def resize_lvol(id, new_size):
     logger.info(f"Resizing LVol: {lvol.get_id()}")
     logger.info(f"Current size: {utils.humanbytes(lvol.size)}, new size: {utils.humanbytes(new_size)}")
 
-    size_in_mib = int(new_size / (constants.ONE_KB * constants.ONE_KB))
+    size_in_mib = utils.convert_size(new_size, 'MiB')
 
     rpc_client = RPCClient(
         snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)