sbcli-pre 1.0.9__zip → 1.1.1__zip

{sbcli_pre-1.0.9 → sbcli_pre-1.1.1}/PKG-INFO

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

{sbcli_pre-1.0.9 → sbcli_pre-1.1.1}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=1.0.9
+SIMPLY_BLOCK_VERSION=1.1.1
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:pre-release
 

{sbcli_pre-1.0.9 → sbcli_pre-1.1.1}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.0.9 → sbcli_pre-1.1.1}/simplyblock_cli/cli.py

@@ -42,8 +42,6 @@ class CLIWrapper:
         sub_command.add_argument("--jm-percent", help='Number in percent to use for JM from each device',
                                  type=int, default=3, dest='jm_percent')
         sub_command.add_argument("--data-nics", help='Data interface names', nargs='+', dest='data_nics')
-        sub_command.add_argument("--cpu-mask", help='SPDK app CPU mask, default is all cores found',
-                                 dest='spdk_cpu_mask')
         sub_command.add_argument("--memory", help='SPDK huge memory allocation, default is 4G', dest='spdk_mem')
         sub_command.add_argument("--spdk-image", help='SPDK image uri', dest='spdk_image')
         sub_command.add_argument("--spdk-debug", help='Enable spdk debug logs', dest='spdk_debug', required=False, action='store_true')
@@ -57,10 +55,6 @@ class CLIWrapper:
         sub_command = self.add_sub_command(subparser, "delete", 'Delete storage node obj')
         sub_command.add_argument("node_id", help='UUID of storage node')
 
-        # remove storage node
-        sub_command = self.add_sub_command(subparser, "delete", 'Delete storage node')
-        sub_command.add_argument("node_id", help='UUID of storage node')
-
         # remove storage node
         sub_command = self.add_sub_command(subparser, "remove", 'Remove storage node')
         sub_command.add_argument("node_id", help='UUID of storage node')
@@ -78,11 +72,10 @@ class CLIWrapper:
 
         # Restart storage node
         sub_command = self.add_sub_command(
-            subparser, "restart", 'Restart a storage node.', usage='All functions and device drivers will be reset. '
+            subparser, "restart", 'Restart a storage node', usage='All functions and device drivers will be reset. '
                                   'During restart, the node does not accept IO. In a high-availability setup, '
-                                  'this will not impact operations.')
+                                  'this will not impact operations')
         sub_command.add_argument("node_id", help='UUID of storage node')
-        sub_command.add_argument("--cpu-mask", help='SPDK app CPU mask, default is all cores found', dest='spdk_cpu_mask')
         sub_command.add_argument("--memory", help='SPDK huge memory allocation, default is 4G', dest='spdk_mem')
         sub_command.add_argument("--spdk-image", help='SPDK image uri', dest='spdk_image')
         sub_command.add_argument("--spdk-debug", help='Enable spdk debug logs', dest='spdk_debug', required=False, action='store_true')
@@ -96,7 +89,7 @@ class CLIWrapper:
 
         # Shutdown storage node
         sub_command = self.add_sub_command(
-            subparser, "shutdown", 'Shutdown a storage node.', usage='Once the command is issued, the node will stop accepting '
+            subparser, "shutdown", 'Shutdown a storage node', usage='Once the command is issued, the node will stop accepting '
                                    'IO,but IO, which was previously received, will still be processed. '
                                    'In a high-availability setup, this will not impact operations.')
         sub_command.add_argument("node_id", help='UUID of storage node')
@@ -104,7 +97,7 @@ class CLIWrapper:
 
         # Suspend storage node
         sub_command = self.add_sub_command(
-            subparser, "suspend", 'Suspend a storage node.', usage='The node will stop accepting new IO, but will finish '
+            subparser, "suspend", 'Suspend a storage node', usage='The node will stop accepting new IO, but will finish '
                                   'processing any IO, which has been received already.')
         sub_command.add_argument("node_id", help='UUID of storage node')
         sub_command.add_argument("--force", help='Force node suspend', required=False, action='store_true')
@@ -113,13 +106,13 @@ class CLIWrapper:
         sub_command = self.add_sub_command(subparser, "resume", 'Resume a storage node')
         sub_command.add_argument("node_id", help='UUID of storage node')
 
-        sub_command = self.add_sub_command(subparser, "get-io-stats", 'Returns the current io statistics of a node')
+        sub_command = self.add_sub_command(subparser, "get-io-stats", 'Get node IO statistics')
         sub_command.add_argument("node_id", help='Node ID')
         sub_command.add_argument("--history", help='list history records -one for every 15 minutes- '
                                                    'for XX days and YY hours -up to 10 days in total-, format: XXdYYh')
 
         sub_command = self.add_sub_command(
-            subparser, 'get-capacity', 'Returns the size, absolute and relative utilization of the node in bytes')
+            subparser, 'get-capacity', 'Get node capacity statistics')
         sub_command.add_argument("node_id", help='Node ID')
         sub_command.add_argument("--history", help='list history records -one for every 15 minutes- '
                                                    'for XX days and YY hours -up to 10 days in total-, format: XXdYYh')
@@ -132,7 +125,7 @@ class CLIWrapper:
         sub_command.add_argument(
             "--json", help='Print outputs in json format', required=False, action='store_true')
 
-        sub_command = self.add_sub_command(subparser, "device-testing-mode", 'set pt testing bdev mode')
+        sub_command = self.add_sub_command(subparser, "device-testing-mode", 'Set device testing mode')
         sub_command.add_argument("device_id", help='Device UUID')
         sub_command.add_argument("mode", help='Testing mode', choices=[
             'full_pass_through', 'io_error_on_read', 'io_error_on_write',
@@ -150,7 +143,7 @@ class CLIWrapper:
         sub_command.add_argument("device_id", help='the devices\'s UUID')
 
         # Reset storage device
-        sub_command = self.add_sub_command(subparser, "restart-device", 'Re add "removed" storage device',
+        sub_command = self.add_sub_command(subparser, "restart-device", 'Restart storage device',
                                            usage="a previously removed or unavailable device may be returned into "
                                                  "online state. If the device is not physically present, accessible "
                                                  "or healthy, it will flip back into unavailable state again.")
@@ -163,30 +156,29 @@ class CLIWrapper:
                                                  "auto-rebalancing background process in which some cluster "
                                                  "capacity is re-distributed to this newly added device.")
         sub_command = self.add_sub_command(
-            subparser, 'remove-device', 'Remove a storage device.', usage='The device will become unavailable, independently '
+            subparser, 'remove-device', 'Remove a storage device', usage='The device will become unavailable, independently '
                                         'if it was physically removed from the server. This function can be used if '
                                         'auto-detection of removal did not work or if the device must be maintained '
                                         'otherwise while remaining inserted into the server. ')
         sub_command.add_argument("device_id", help='Storage device ID')
         sub_command.add_argument("--force", help='Force device remove', required=False, action='store_true')
 
-        sub_command = self.add_sub_command(
-            subparser, 'set-failed-device', 'Set storage device to failed state. ', usage='This command can be used, '
-                                            'if an administrator believes that the device must be changed, '
-                                            'but its status and health state do not lead to an automatic detection '
-                                            'of the failure state. Attention!!! The failed state is final, all data '
-                                            'on the device will be automatically recovered to other devices '
-                                            'in the cluster. ')
+        # sub_command = self.add_sub_command(
+        #     subparser, 'set-failed-device', 'Set storage device to failed state. ', usage='This command can be used, '
+        #                                     'if an administrator believes that the device must be changed, '
+        #                                     'but its status and health state do not lead to an automatic detection '
+        #                                     'of the failure state. Attention!!! The failed state is final, all data '
+        #                                     'on the device will be automatically recovered to other devices '
+        #                                     'in the cluster. ')
 
         sub_command = self.add_sub_command(
-            subparser, 'get-capacity-device', 'Returns the size, absolute and relative utilization of '
-                                              'the device in bytes')
+            subparser, 'get-capacity-device', 'Get device capacity')
         sub_command.add_argument("device_id", help='Storage device ID')
         sub_command.add_argument("--history", help='list history records -one for every 15 minutes- '
                                                    'for XX days and YY hours -up to 10 days in total-, format: XXdYYh')
 
         sub_command = self.add_sub_command(
-            subparser, 'get-io-stats-device', 'Returns device IO statistics')
+            subparser, 'get-io-stats-device', 'Get device IO statistics')
         sub_command.add_argument("device_id", help='Storage device ID')
         sub_command.add_argument("--history", help='list history records -one for every 15 minutes- '
                                                    'for XX days and YY hours -up to 10 days in total-, format: XXdYYh')
@@ -278,36 +270,33 @@ class CLIWrapper:
         sub_command.add_argument("cluster_id", help='the cluster UUID')
 
         sub_command = self.add_sub_command(
-            subparser, 'get-capacity', 'Returns the current total available capacity, utilized capacity '
-                                       '(in percent and absolute) and provisioned capacity (in percent and absolute) '
-                                       'in GB in the cluster.')
+            subparser, 'get-capacity', 'Get cluster capacity')
         sub_command.add_argument("cluster_id", help='the cluster UUID')
         sub_command.add_argument("--json", help='Print json output', required=False, action='store_true')
         sub_command.add_argument("--history", help='(XXdYYh), list history records (one for every 15 minutes) '
                                                    'for XX days and YY hours (up to 10 days in total).')
 
         sub_command = self.add_sub_command(
-            subparser, 'get-io-stats', 'Returns cluster IO statistics.')
+            subparser, 'get-io-stats', 'Get cluster IO statistics')
         sub_command.add_argument("cluster_id", help='the cluster UUID')
         sub_command.add_argument("--records", help='Number of records, default: 20', type=int, default=20)
         sub_command.add_argument("--history", help='(XXdYYh), list history records (one for every 15 minutes) '
                                                    'for XX days and YY hours (up to 10 days in total).')
 
-        sub_command = self.add_sub_command(
-            subparser, 'get-cli-ssh-pass', 'returns the ssh password for the CLI ssh connection')
-        sub_command.add_argument("cluster_id", help='the cluster UUID')
+        # sub_command = self.add_sub_command(
+        #     subparser, 'get-cli-ssh-pass', 'returns the ssh password for the CLI ssh connection')
+        # sub_command.add_argument("cluster_id", help='the cluster UUID')
 
         # get-logs
         sub_command = self.add_sub_command(subparser, 'get-logs', 'Returns cluster status logs')
         sub_command.add_argument("cluster_id", help='cluster uuid')
 
         # get-secret
-        sub_command = self.add_sub_command(subparser, 'get-secret', 'Returns auto generated, 20 characters secret.')
+        sub_command = self.add_sub_command(subparser, 'get-secret', 'Get cluster secret')
         sub_command.add_argument("cluster_id", help='cluster uuid')
 
         # set-secret
-        sub_command = self.add_sub_command(subparser, 'upd-secret', 'Updates the secret (replaces the existing '
-                                                                    'one with a new one) and returns the new one.')
+        sub_command = self.add_sub_command(subparser, 'upd-secret', 'Updates the cluster secret')
         sub_command.add_argument("cluster_id", help='cluster uuid')
         sub_command.add_argument("secret", help='new 20 characters password')
 
@@ -404,7 +393,7 @@ class CLIWrapper:
 
         # delete lvol
         sub_command = self.add_sub_command(
-            subparser, 'delete', 'Delete LVol.', usage='This is only possible, if no more snapshots and non-inflated clones '
+            subparser, 'delete', 'Delete LVol', usage='This is only possible, if no more snapshots and non-inflated clones '
                                  'of the volume exist. The volume must be suspended before it can be deleted. ')
         sub_command.add_argument("id", help='LVol id or ids', nargs='+')
         sub_command.add_argument("--force", help='Force delete LVol from the cluster', required=False,
@@ -412,13 +401,13 @@ class CLIWrapper:
 
         # show connection string
         sub_command = self.add_sub_command(
-            subparser, 'connect', 'show connection strings to cluster.', usage='Multiple connections to the cluster are '
+            subparser, 'connect', 'Get lvol connection strings', usage='Multiple connections to the cluster are '
                                   'always available for multi-pathing and high-availability.')
         sub_command.add_argument("id", help='LVol id')
 
         # lvol resize
         sub_command = self.add_sub_command(
-            subparser, 'resize', 'Resize LVol.', usage='The lvol cannot be exceed the maximum size for lvols. It cannot '
+            subparser, 'resize', 'Resize LVol', usage='The lvol cannot be exceed the maximum size for lvols. It cannot '
                                  'exceed total remaining provisioned space in pool. It cannot drop below the '
                                  'current utilization.')
         sub_command.add_argument("id", help='LVol id')
@@ -445,23 +434,22 @@ class CLIWrapper:
 
         # lvol get-capacity
         sub_command = self.add_sub_command(
-            subparser, 'get-capacity', 'Returns the current (or historic) provisioned and utilized '
-                                       '(in percent and absolute) capacity.')
+            subparser, 'get-capacity',"Get LVol capacity")
         sub_command.add_argument("id", help='LVol id')
         sub_command.add_argument("--history", help='(XXdYYh), list history records (one for every 15 minutes) '
                                                    'for XX days and YY hours (up to 10 days in total).')
 
         # lvol get-io-stats
         sub_command = self.add_sub_command(
-            subparser, 'get-io-stats', help="Returns LVol IO statistics")
+            subparser, 'get-io-stats', help="Get LVol IO statistics")
         sub_command.add_argument("id", help='LVol id')
         sub_command.add_argument("--history", help='(XXdYYh), list history records (one for every 15 minutes) '
                                                    'for XX days and YY hours (up to 10 days in total).')
 
-        sub_command = self.add_sub_command(subparser, 'send-cluster-map', 'send distr cluster map')
+        sub_command = self.add_sub_command(subparser, 'send-cluster-map', 'send cluster map')
         sub_command.add_argument("id", help='LVol id')
 
-        sub_command = self.add_sub_command(subparser, 'get-cluster-map', 'get distr cluster map')
+        sub_command = self.add_sub_command(subparser, 'get-cluster-map', 'get cluster map')
         sub_command.add_argument("id", help='LVol id')
 
         # check lvol
@@ -534,24 +522,21 @@ class CLIWrapper:
         sub_command.add_argument("pool_id", help='pool uuid')
 
         # get-secret
-        sub_command = self.add_sub_command(subparser, 'get-secret', 'Returns auto generated, 20 characters secret.')
+        sub_command = self.add_sub_command(subparser, 'get-secret', 'Get pool secret')
         sub_command.add_argument("pool_id", help='pool uuid')
 
         # get-secret
-        sub_command = self.add_sub_command(subparser, 'upd-secret', 'Updates the secret (replaces the existing '
-                                                                    'one with a new one) and returns the new one.')
+        sub_command = self.add_sub_command(subparser, 'upd-secret', 'Updates pool secret')
         sub_command.add_argument("pool_id", help='pool uuid')
         sub_command.add_argument("secret", help='new 20 characters password')
 
         # get-capacity
-        sub_command = self.add_sub_command(subparser, 'get-capacity', 'Return provisioned, utilized (absolute) '
-                                                                      'and utilized (percent) storage on the Pool.')
+        sub_command = self.add_sub_command(subparser, 'get-capacity', 'Get pool capacity')
         sub_command.add_argument("pool_id", help='pool uuid')
 
         # get-io-stats
         sub_command = self.add_sub_command(
-            subparser, 'get-io-stats', 'Returns either the current or historic io statistics '
-                                       '(read-IO, write-IO, total-IO, read mbs, write mbs, total mbs).')
+            subparser, 'get-io-stats', 'Get pool IO statistics')
         sub_command.add_argument("id", help='Pool id')
         sub_command.add_argument("--history", help='(XXdYYh), list history records (one for every 15 minutes) '
                                                    'for XX days and YY hours (up to 10 days in total).')
@@ -605,7 +590,7 @@ class CLIWrapper:
         sub_command.add_argument("node_id", help='Caching node UUID')
         sub_command.add_argument("lvol_id", help='LVol UUID')
 
-        sub_command = self.add_sub_command(subparser, 'recreate', 'recreate Caching node bdevs ')
+        sub_command = self.add_sub_command(subparser, 'recreate', 'recreate Caching node bdevs')
         sub_command.add_argument("node_id", help='Caching node UUID')
 
     def init_parser(self):
@@ -659,13 +644,6 @@ class CLIWrapper:
                 num_partitions_per_dev = args.partitions
                 jm_percent = args.jm_percent
 
-                spdk_cpu_mask = None
-                if args.spdk_cpu_mask:
-                    if self.validate_cpu_mask(args.spdk_cpu_mask):
-                        spdk_cpu_mask = args.spdk_cpu_mask
-                    else:
-                        return f"Invalid cpu mask value: {args.spdk_cpu_mask}"
-
                 spdk_mem = None
                 if args.spdk_mem:
                     spdk_mem = self.parse_size(args.spdk_mem)
@@ -673,7 +651,7 @@ class CLIWrapper:
                         return f"SPDK memory:{args.spdk_mem} must be larger than 1G"
 
                 out = storage_ops.add_node(
-                    cluster_id, node_ip, ifname, data_nics, spdk_cpu_mask, spdk_mem, spdk_image, spdk_debug,
+                    cluster_id, node_ip, ifname, data_nics, spdk_mem, spdk_image, spdk_debug,
                     small_pool_count, large_pool_count, small_bufsize, large_bufsize, num_partitions_per_dev, jm_percent)
                 return out
 
@@ -692,13 +670,6 @@ class CLIWrapper:
                 spdk_image = args.spdk_image
                 spdk_debug = args.spdk_debug
 
-                cpu_mask = None
-                if args.spdk_cpu_mask:
-                    if self.validate_cpu_mask(args.spdk_cpu_mask):
-                        cpu_mask = args.spdk_cpu_mask
-                    else:
-                        return f"Invalid cpu mask value: {args.spdk_cpu_mask}"
-
                 spdk_mem = None
                 if args.spdk_mem:
                     spdk_mem = self.parse_size(args.spdk_mem)
@@ -712,7 +683,7 @@ class CLIWrapper:
                 large_bufsize = args.large_bufsize
 
                 ret = storage_ops.restart_storage_node(
-                    node_id, cpu_mask, spdk_mem,
+                    node_id, spdk_mem,
                     spdk_image, spdk_debug,
                     small_pool_count, large_pool_count,
                     small_bufsize, large_bufsize)

{sbcli_pre-1.0.9 → sbcli_pre-1.1.1}/simplyblock_core/constants.py

@@ -53,7 +53,7 @@ GRAYLOG_CHECK_INTERVAL_SEC = 60
 FDB_CHECK_INTERVAL_SEC = 60
 
 SIMPLY_BLOCK_DOCKER_IMAGE = "simplyblock/simplyblock:pre-release"
-SIMPLY_BLOCK_CLI_NAME = "sbcli-pre"
+SIMPLY_BLOCK_CLI_NAME = "sbcli"
 TASK_EXEC_INTERVAL_SEC = 30
 TASK_EXEC_RETRY_COUNT = 8
 

{sbcli_pre-1.0.9 → sbcli_pre-1.1.1}/simplyblock_core/controllers/device_controller.py

@@ -110,7 +110,8 @@ def _def_create_device_stack(device_obj, snode):
     alceml_id = device_obj.get_id()
     alceml_name = get_alceml_name(alceml_id)
     logger.info(f"adding {alceml_name}")
-    ret = rpc_client.bdev_alceml_create(alceml_name, test_name, alceml_id, pba_init_mode=2)
+    ret = rpc_client.bdev_alceml_create(alceml_name, test_name, alceml_id, pba_init_mode=2,
+                                        dev_cpu_mask=snode.dev_cpu_mask)
     if not ret:
         logger.error(f"Failed to create alceml bdev: {alceml_name}")
         return False
@@ -145,7 +146,8 @@ def _def_create_device_stack(device_obj, snode):
     ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
 
     if hasattr(device_obj, 'jm_bdev') and device_obj.jm_bdev:
-        ret = rpc_client.bdev_jm_create(device_obj.jm_bdev, device_obj.alceml_bdev)
+        ret = rpc_client.bdev_jm_create(device_obj.jm_bdev, device_obj.alceml_bdev,
+                                        dev_cpu_mask=snode.dev_cpu_mask)
         if not ret:
             logger.error(f"Failed to create jm bdev: {device_obj.jm_bdev}")
             return False

{sbcli_pre-1.0.9 → sbcli_pre-1.1.1}/simplyblock_core/controllers/lvol_controller.py

@@ -265,7 +265,7 @@ def add_lvol(name, size, host_id_or_name, pool_id_or_name, use_comp, use_crypto,
 
     # name, vuid, ndcs, npcs, num_blocks, block_size, alloc_names
     ret = rpc_client.bdev_distrib_create(f"distr_{name}", vuid, distr_ndcs, distr_npcs, num_blocks, distr_bs, jm_names,
-                                         distr_chunk_bs)
+                                         distr_chunk_bs, dev_cpu_mask=snode.dev_cpu_mask)
     bdev_stack.append({"type": "distr", "name": f"distr_{name}"})
     if not ret:
         logger.error("failed to create Distr bdev")
@@ -758,6 +758,7 @@ def _create_bdev_stack(lvol, snode, ha_comm_addrs, ha_inode_self):
             params['jm_names'] = get_jm_names(snode)
             params['ha_comm_addrs'] = ha_comm_addrs
             params['ha_inode_self'] = ha_inode_self
+            params['dev_cpu_mask'] = snode.dev_cpu_mask
             ret = rpc_client.bdev_distrib_create(**params)
             if ret:
                 ret = distr_controller.send_cluster_map_to_node(snode)

{sbcli_pre-1.0.9 → sbcli_pre-1.1.1}/simplyblock_core/controllers/snapshot_controller.py

@@ -49,7 +49,7 @@ def add(lvol_id, snapshot_name):
     ret = rpc_client.bdev_distrib_create(
         base_name, new_vuid, lvol.ndcs, lvol.npcs, num_blocks,
         lvol.distr_bs, lvol_controller.get_jm_names(snode), lvol.distr_chunk_bs,
-        None, None, lvol.distr_page_size)
+        None, None, lvol.distr_page_size, dev_cpu_mask=snode.dev_cpu_mask)
     if not ret:
         logger.error("Failed to create Distr bdev")
         return False, "Failed to create Distr bdev"
@@ -232,7 +232,8 @@ def clone(snapshot_id, clone_name, new_size=0):
     name = f"distr_{new_vuid}_1"
     ret = rpc_client.bdev_distrib_create(
         name, new_vuid, lvol.ndcs, lvol.npcs, num_blocks,
-        lvol.distr_bs, jm_names, lvol.distr_chunk_bs, None, None, lvol.distr_page_size)
+        lvol.distr_bs, jm_names, lvol.distr_chunk_bs, None, None, lvol.distr_page_size,
+        dev_cpu_mask=snode.dev_cpu_mask)
     if not ret:
         msg="Failed to create Distr bdev"
         logger.error(msg)

sbcli_pre-1.1.1/simplyblock_core/controllers/tasks_controller.py

@@ -0,0 +1,70 @@
+# coding=utf-8
+import logging
+import time
+import uuid
+
+from simplyblock_core import kv_store
+from simplyblock_core.controllers import tasks_events
+from simplyblock_core.models.job_schedule import JobSchedule
+
+logger = logging.getLogger()
+db_controller = kv_store.DBController()
+
+
+def _validate_new_task_node_restart(cluster_id, node_id):
+    tasks = db_controller.get_job_tasks(cluster_id)
+    for task in tasks:
+        if task.function_name == JobSchedule.FN_NODE_RESTART and task.node_id == node_id:
+            if task.status != JobSchedule.STATUS_DONE:
+                logger.info(f"Task found, skip adding new task: {task.get_id()}")
+                return False
+    return True
+
+
+def _validate_new_task_dev_restart(cluster_id, node_id, device_id):
+    tasks = db_controller.get_job_tasks(cluster_id)
+    for task in tasks:
+        if task.function_name == JobSchedule.FN_DEV_RESTART and task.device_id == device_id:
+            if task.status != JobSchedule.STATUS_DONE:
+                logger.info(f"Task found, skip adding new task: {task.get_id()}")
+                return False
+        elif task.function_name == JobSchedule.FN_NODE_RESTART and task.node_id == node_id:
+            if task.status != JobSchedule.STATUS_DONE:
+                logger.info(f"Task found, skip adding new task: {task.get_id()}")
+                return False
+    return True
+
+
+def _add_task(function_name, cluster_id, node_id, device_id):
+
+    if function_name in [JobSchedule.FN_DEV_RESTART, JobSchedule.FN_DEV_MIG]:
+        if not _validate_new_task_dev_restart(cluster_id, node_id, device_id):
+            return False
+    elif function_name == JobSchedule.FN_NODE_RESTART:
+        if not _validate_new_task_node_restart(cluster_id, node_id):
+            return False
+
+    task_obj = JobSchedule()
+    task_obj.uuid = str(uuid.uuid4())
+    task_obj.cluster_id = cluster_id
+    task_obj.node_id = node_id
+    task_obj.device_id = device_id
+    task_obj.date = int(time.time())
+    task_obj.function_name = function_name
+    task_obj.status = JobSchedule.STATUS_NEW
+    task_obj.write_to_db(db_controller.kv_store)
+    tasks_events.task_create(task_obj)
+    return task_obj.uuid
+
+
+def add_device_mig_task(device_id):
+    device = db_controller.get_storage_devices(device_id)
+    return _add_task(JobSchedule.FN_DEV_MIG, device.cluster_id, device.node_id, device.get_id())
+
+
+def add_device_to_auto_restart(device):
+    return _add_task(JobSchedule.FN_DEV_RESTART, device.cluster_id, device.node_id, device.get_id())
+
+
+def add_node_to_auto_restart(node):
+    return _add_task(JobSchedule.FN_NODE_RESTART, node.cluster_id, node.get_id(), "")

{sbcli_pre-1.0.9 → sbcli_pre-1.1.1}/simplyblock_core/models/storage_node.py

@@ -70,6 +70,10 @@ class StorageNode(BaseModel):
 
         # spdk params
         "spdk_cpu_mask": {"type": str, "default": ""},
+        "app_thread_mask": {"type": str, "default": ""},
+        "pollers_mask": {"type": str, "default": ""},
+        "os_cores": {"type": str, "default": []},
+        "dev_cpu_mask": {"type": str, "default": ""},
         "spdk_mem": {"type": int, "default": 0},
         "spdk_image": {"type": str, "default": ""},
         "spdk_debug": {"type": bool, "default": False},

{sbcli_pre-1.0.9 → sbcli_pre-1.1.1}/simplyblock_core/rpc_client.py

@@ -318,7 +318,8 @@ class RPCClient:
         params = {"name": name}
         return self._request2("ultra21_bdev_pass_delete", params)
 
-    def bdev_alceml_create(self, alceml_name, nvme_name, uuid, pba_init_mode=3):
+    def bdev_alceml_create(self, alceml_name, nvme_name, uuid, pba_init_mode=3,
+                           dev_cpu_mask=""):
         params = {
             "name": alceml_name,
             "cntr_path": nvme_name,
@@ -334,10 +335,13 @@ class RPCClient:
             "use_optimized": True,
             "pba_nbalign": 4096
         }
+        if dev_cpu_mask:
+            params["bdb_lcpu_mask"] = int(dev_cpu_mask,16)
         return self._request("bdev_alceml_create", params)
 
     def bdev_distrib_create(self, name, vuid, ndcs, npcs, num_blocks, block_size, jm_names,
-                            chunk_size, ha_comm_addrs=None, ha_inode_self=None, pba_page_size=2097152):
+                            chunk_size, ha_comm_addrs=None, ha_inode_self=None, pba_page_size=2097152,
+                            dev_cpu_mask=""):
         """"
             // Optional (not specified = no HA)
             // Comma-separated communication addresses, for each node, e.g. "192.168.10.1:45001,192.168.10.1:32768".
@@ -363,6 +367,8 @@ class RPCClient:
         if ha_comm_addrs:
             params['ha_comm_addrs'] = ha_comm_addrs
             params['ha_inode_self'] = ha_inode_self
+        if dev_cpu_mask:
+            params["bdb_lcpu_mask"] = int(dev_cpu_mask, 16)
 
         return self._request("bdev_distrib_create", params)
 
@@ -583,12 +589,14 @@ class RPCClient:
         }
         return self._request("ultra21_lvol_dismount", params)
 
-    def bdev_jm_create(self, name, name_storage1, block_size=4096):
+    def bdev_jm_create(self, name, name_storage1, block_size=4096, dev_cpu_mask=""):
         params = {
             "name": name,
             "name_storage1": name_storage1,
             "block_size": block_size
         }
+        if dev_cpu_mask:
+            params["bdb_lcpu_mask"] = int(dev_cpu_mask, 16)
         return self._request("bdev_jm_create", params)
 
     def bdev_jm_delete(self, name):
@@ -641,3 +649,21 @@ class RPCClient:
     def bdev_jm_unmap_vuid(self, name, vuid):
         params = {"name": name, "vuid": vuid}
         return self._request("bdev_jm_unmap_vuid", params)
+
+    def sock_impl_set_options(self):
+        method = "sock_impl_set_options"
+        params = {"impl_name": "posix", "enable_quickack": True,
+                  "enable_zerocopy_send_server": True,
+                  "enable_zerocopy_send_client": True}
+        return self._request(method, params)
+
+    def nvmf_set_config(self, poll_groups_mask):
+        params = {"poll_groups_mask": poll_groups_mask}
+        return self._request("nvmf_set_config", params)
+
+    def thread_get_stats(self):
+        return self._request("thread_get_stats")
+
+    def thread_set_cpumask(self, app_thread_process_id, app_thread_mask):
+        params = {"id": app_thread_process_id, "cpumask": app_thread_mask}
+        return self._request("thread_set_cpumask", params)

{sbcli_pre-1.0.9 → sbcli_pre-1.1.1}/simplyblock_core/services/tasks_runner_migration.py

@@ -48,7 +48,7 @@ while True:
         logger.error("No clusters found!")
     else:
         for cl in clusters:
-            tasks = db_controller.get_job_tasks(cl.get_id())
+            tasks = db_controller.get_job_tasks(cl.get_id(), reverse=False)
             for task in tasks:
                 delay_seconds = constants.TASK_EXEC_INTERVAL_SEC
                 if task.function_name == JobSchedule.FN_DEV_MIG: