sbcli-dev 4.0.64__zip → 4.0.66__zip

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/PKG-INFO

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

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/env_var

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

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_cli/cli.py

@@ -57,6 +57,7 @@ class CLIWrapper:
         sub_command.add_argument("--iobuf_large_bufsize", help='bdev_set_options param', dest='large_bufsize',  type=int, default=0)
         sub_command.add_argument("--enable-test-device", help='Enable creation of test device', action='store_true')
         sub_command.add_argument("--disable-ha-jm", help='Disable HA JM for distrib creation', action='store_false', dest='enable_ha_jm', default=True)
+        sub_command.add_argument("--namespace", help='k8s namespace to deploy on',)
 
 
         # delete storage node
@@ -693,7 +694,7 @@ class CLIWrapper:
         if args.debug:
             self.logger.setLevel(logging.DEBUG)
         else:
-            self.logger.setLevel(constants.LOG_LEVEL)
+            self.logger.setLevel(logging.INFO)
         logging.getLogger("urllib3.connectionpool").setLevel(logging.WARNING)
 
         args_dict = args.__dict__
@@ -739,6 +740,7 @@ class CLIWrapper:
                 enable_test_device = args.enable_test_device
                 enable_ha_jm = args.enable_ha_jm
                 number_of_distribs = args.number_of_distribs
+                namespace = args.namespace
 
                 out = storage_ops.add_node(
                     cluster_id=cluster_id,
@@ -757,7 +759,7 @@ class CLIWrapper:
                     jm_percent=jm_percent,
                     number_of_devices=number_of_devices,
                     enable_test_device=enable_test_device,
-                    namespace=None,
+                    namespace=namespace,
                     number_of_distribs=number_of_distribs,
                     enable_ha_jm=enable_ha_jm
                 )

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_core/constants.py

@@ -6,8 +6,8 @@ KVD_DB_FILE_PATH = '/etc/foundationdb/fdb.cluster'
 KVD_DB_TIMEOUT_MS = 10000
 SPK_DIR = '/home/ec2-user/spdk'
 RPC_HTTP_PROXY_PORT = 8080
-LOG_LEVEL = logging.INFO
-LOG_WEB_DEBUG = False
+LOG_LEVEL = logging.DEBUG
+LOG_WEB_DEBUG = True
 
 INSTALL_DIR = os.path.dirname(os.path.realpath(__file__))
 

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_core/controllers/device_controller.py

@@ -818,7 +818,7 @@ def restart_jm_device(device_id, force=False, format_alceml=False):
             bdevs_names = [d['name'] for d in rpc_client.get_bdevs()]
             jm_nvme_bdevs = []
             for dev in snode.nvme_devices:
-                if dev.status != NVMeDevice.STATUS_ONLINE:
+                if dev.status not in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_NEW]:
                     continue
                 dev_part = f"{dev.nvme_bdev[:-2]}p1"
                 if dev_part in bdevs_names:

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_core/controllers/health_controller.py

@@ -40,15 +40,15 @@ def check_cluster(cluster_id):
                 "Status": "ok" if ret else "failed"
             })
 
-        for lvol in db_controller.get_lvols(cluster_id):
-            ret = check_lvol(lvol.get_id())
-            result &= ret
-            print("*" * 100)
-            data.append({
-                "Kind": "LVol",
-                "UUID": lvol.get_id(),
-                "Status": "ok" if ret else "failed"
-            })
+    for lvol in db_controller.get_lvols(cluster_id):
+        ret = check_lvol(lvol.get_id())
+        result &= ret
+        print("*" * 100)
+        data.append({
+            "Kind": "LVol",
+            "UUID": lvol.get_id(),
+            "Status": "ok" if ret else "failed"
+        })
     print(utils.print_table(data))
     return result
 
@@ -163,6 +163,8 @@ def check_node(node_id, with_devices=True):
             if dev.status in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_UNAVAILABLE]:
                 ret = check_device(dev.get_id())
                 node_devices_check &= ret
+            else:
+                logger.info(f"Device skipped: {dev.get_id()} status: {dev.status}")
             print("*" * 100)
 
         logger.info(f"Node remote device: {len(snode.remote_devices)}")

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_core/distr_controller.py

@@ -35,6 +35,8 @@ def send_node_status_event(node, node_status, target_node=None):
 
 
 def send_dev_status_event(device, dev_status, target_node=None):
+    if dev_status == NVMeDevice.STATUS_NEW:
+        return
     db_controller = DBController()
     storage_ID = device.cluster_device_order
     node_status_event = {

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_core/models/job_schedule.py

@@ -9,7 +9,7 @@ class JobSchedule(BaseModel):
 
     STATUS_NEW = 'new'
     STATUS_RUNNING = 'running'
-    # STATUS_RETRYING = 'retrying'
+    STATUS_SUSPENDED = 'suspended'
     STATUS_DONE = 'done'
 
     FN_DEV_RESTART = "device_restart"

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_core/models/storage_node.py

@@ -79,6 +79,7 @@ class StorageNode(BaseModel):
         "lvstore": {"type": str, 'default': ""},
         "raid": {"type": str, 'default': ""},
         "lvstore_stack": {"type": List[dict], 'default': []},
+        "jm_vuid": {"type": int, "default": 0},
 
         # spdk params
         "spdk_cpu_mask": {"type": str, "default": ""},

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_core/rpc_client.py

@@ -837,3 +837,9 @@ class RPCClient:
             "file": file,
         }
         return self._request("bdev_lvs_dump", params)
+
+    def jc_explicit_synchronization(self, jm_vuid):
+        params = {
+            "jm_vuid": jm_vuid
+        }
+        return self._request("jc_explicit_synchronization", params)

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_core/services/tasks_runner_failed_migration.py

@@ -32,14 +32,14 @@ def task_runner(task):
         task.write_to_db(db_controller.kv_store)
         return True
 
-    if task.status == JobSchedule.STATUS_NEW:
+    if task.status in [JobSchedule.STATUS_NEW ,JobSchedule.STATUS_SUSPENDED]:
         task.status = JobSchedule.STATUS_RUNNING
         task.write_to_db(db_controller.kv_store)
         tasks_events.task_updated(task)
 
     if snode.status != StorageNode.STATUS_ONLINE:
         task.function_result = "node is not online, retrying"
-        task.status = JobSchedule.STATUS_NEW
+        task.status = JobSchedule.STATUS_SUSPENDED
         task.retry += 1
         task.write_to_db(db_controller.kv_store)
         return False
@@ -62,6 +62,7 @@ def task_runner(task):
             logger.error(f"Failed to start device migration task, storage_ID: {device.cluster_device_order}")
             task.function_result = "Failed to start device migration task"
             task.retry += 1
+            task.status = JobSchedule.STATUS_SUSPENDED
             task.write_to_db(db_controller.kv_store)
             return False
 
@@ -83,7 +84,7 @@ def task_runner(task):
                     task.status = JobSchedule.STATUS_DONE
                 else:
                     task.function_result = "Failed to complete migration, retrying"
-                    task.status = JobSchedule.STATUS_NEW
+                    task.status = JobSchedule.STATUS_SUSPENDED
                     task.retry += 1
                     del task.function_params["migration"]
                 task.write_to_db(db_controller.kv_store)
@@ -91,7 +92,7 @@ def task_runner(task):
 
             elif migration_status == "failed":
                 task.function_result = "Failed to complete migration, retrying"
-                task.status = JobSchedule.STATUS_NEW
+                task.status = JobSchedule.STATUS_SUSPENDED
                 task.retry += 1
                 del task.function_params["migration"]
                 task.write_to_db(db_controller.kv_store)
@@ -131,7 +132,7 @@ while True:
             for task in tasks:
                 delay_seconds = 5
                 if task.function_name == JobSchedule.FN_FAILED_DEV_MIG:
-                    if task.status == JobSchedule.STATUS_NEW:
+                    if task.status in [JobSchedule.STATUS_NEW, JobSchedule.STATUS_SUSPENDED]:
                         active_task = tasks_controller.get_active_node_mig_task(task.cluster_id, task.node_id)
                         if active_task:
                             logger.info("task found on same node, retry")

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_core/services/tasks_runner_migration.py

@@ -29,7 +29,7 @@ def task_runner(task):
         task.write_to_db(db_controller.kv_store)
         return True
 
-    if task.status == JobSchedule.STATUS_NEW:
+    if task.status in [JobSchedule.STATUS_NEW, JobSchedule.STATUS_SUSPENDED]:
         task.status = JobSchedule.STATUS_RUNNING
         task.write_to_db(db_controller.kv_store)
         tasks_events.task_updated(task)
@@ -37,7 +37,7 @@ def task_runner(task):
 
     if snode.status != StorageNode.STATUS_ONLINE:
         task.function_result = "node is not online, retrying"
-        task.status = JobSchedule.STATUS_NEW
+        task.status = JobSchedule.STATUS_SUSPENDED
         task.retry += 1
         task.write_to_db(db_controller.kv_store)
         return False
@@ -56,7 +56,7 @@ def task_runner(task):
 
         if not all_devs_online:
             task.function_result = "Some devs are offline, retrying"
-            task.status = JobSchedule.STATUS_NEW
+            task.status = JobSchedule.STATUS_SUSPENDED
             task.retry += 1
             task.write_to_db(db_controller.kv_store)
             return False
@@ -90,7 +90,7 @@ def task_runner(task):
                 if st['error'] == 1:
                     task.function_result = "mig completed with errors, retrying"
                     task.retry += 1
-                    task.status = JobSchedule.STATUS_NEW
+                    task.status = JobSchedule.STATUS_SUSPENDED
                     del task.function_params['migration']
                 else:
                     task.status = JobSchedule.STATUS_DONE
@@ -122,7 +122,7 @@ while True:
             for task in tasks:
                 delay_seconds = 5
                 if task.function_name == JobSchedule.FN_DEV_MIG:
-                    if task.status == JobSchedule.STATUS_NEW:
+                    if task.status in [JobSchedule.STATUS_NEW, JobSchedule.STATUS_SUSPENDED]:
                         active_task = tasks_controller.get_active_node_mig_task(task.cluster_id, task.node_id)
                         if active_task:
                             logger.info("task found on same node, retry")

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_core/services/tasks_runner_new_dev_migration.py

@@ -32,7 +32,7 @@ def task_runner(task):
         task.write_to_db(db_controller.kv_store)
         return True
 
-    if task.status == JobSchedule.STATUS_NEW:
+    if task.status in [JobSchedule.STATUS_NEW ,JobSchedule.STATUS_SUSPENDED]:
         task.status = JobSchedule.STATUS_RUNNING
         task.write_to_db(db_controller.kv_store)
         tasks_events.task_updated(task)
@@ -40,7 +40,7 @@ def task_runner(task):
     if snode.status != StorageNode.STATUS_ONLINE:
         task.function_result = "node is not online, retrying"
         task.retry += 1
-        task.status = JobSchedule.STATUS_NEW
+        task.status = JobSchedule.STATUS_SUSPENDED
         task.write_to_db(db_controller.kv_store)
         return False
 
@@ -56,7 +56,7 @@ def task_runner(task):
         if not all_devs_online:
             task.function_result = "Some devs are offline, retrying"
             task.retry += 1
-            task.status = JobSchedule.STATUS_NEW
+            task.status = JobSchedule.STATUS_SUSPENDED
             task.write_to_db(db_controller.kv_store)
             return False
 
@@ -94,7 +94,7 @@ def task_runner(task):
                 if res_data['error'] == 1:
                     task.function_result = "mig completed with errors, retrying"
                     task.retry += 1
-                    task.status = JobSchedule.STATUS_NEW
+                    task.status = JobSchedule.STATUS_SUSPENDED
                     del task.function_params['migration']
                 else:
                     task.function_result = "Done"
@@ -143,7 +143,7 @@ while True:
             for task in tasks:
                 delay_seconds = 5
                 if task.function_name == JobSchedule.FN_NEW_DEV_MIG:
-                    if task.status == JobSchedule.STATUS_NEW:
+                    if task.status in [JobSchedule.STATUS_NEW, JobSchedule.STATUS_SUSPENDED]:
                         active_task = tasks_controller.get_active_node_mig_task(task.cluster_id, task.node_id)
                         if active_task:
                             logger.info("task found on same node, retry")

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_core/storage_node_ops.py

@@ -539,7 +539,7 @@ def _create_device_partitions(rpc_client, nvme, snode, num_partitions_per_dev, j
     return True
 
 
-def _prepare_cluster_devices_partitions(snode, devices):
+def _prepare_cluster_devices_partitions(snode, devices, without_jm=False):
     db_controller = DBController()
     rpc_client = RPCClient(
         snode.mgmt_ip, snode.rpc_port,
@@ -594,17 +594,20 @@ def _prepare_cluster_devices_partitions(snode, devices):
         if not jm_device:
             logger.error(f"Failed to create JM device")
             return False
+        if without_jm:
+            jm_device.status = JMDevice.STATUS_REMOVED
         snode.jm_device = jm_device
 
     return True
 
 
-def _prepare_cluster_devices_jm_on_dev(snode, devices):
+def _prepare_cluster_devices_jm_on_dev(snode, devices, without_jm=False):
     db_controller = DBController()
 
-    jm_device = devices[0]
     # Set device cluster order
     dev_order = get_next_cluster_device_order(db_controller, snode.cluster_id)
+
+    jm_device = devices[0]
     for index, nvme in enumerate(devices):
         if nvme.size < jm_device.size:
             jm_device = nvme
@@ -624,6 +627,8 @@ def _prepare_cluster_devices_jm_on_dev(snode, devices):
             if not jm_device:
                 logger.error(f"Failed to create JM device")
                 return False
+            if without_jm:
+                jm_device.status = JMDevice.STATUS_REMOVED
             snode.jm_device = jm_device
         else:
             new_device = _create_storage_device_stack(rpc_client, nvme, snode, after_restart=False)
@@ -651,7 +656,8 @@ def _prepare_cluster_devices_on_restart(snode):
 
     for index, nvme in enumerate(snode.nvme_devices):
 
-        if nvme.status not in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_UNAVAILABLE, NVMeDevice.STATUS_READONLY]:
+        if nvme.status not in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_UNAVAILABLE,
+                               NVMeDevice.STATUS_READONLY, NVMeDevice.STATUS_NEW]:
             logger.debug(f"Device is skipped: {nvme.get_id()}, status: {nvme.status}")
             continue
 
@@ -659,11 +665,14 @@ def _prepare_cluster_devices_on_restart(snode):
         if not dev:
             logger.error(f"Failed to create dev stack {nvme.get_id()}")
             return False
-        nvme.status = NVMeDevice.STATUS_ONLINE
-        device_events.device_restarted(dev)
+        if nvme.status == NVMeDevice.STATUS_ONLINE:
+            device_events.device_restarted(dev)
 
     # prepare JM device
     jm_device = snode.jm_device
+    if jm_device is None or jm_device.status == JMDevice.STATUS_REMOVED:
+        return True
+
     if jm_device.jm_nvme_bdev_list:
         all_bdevs_found = True
         for bdev_name in jm_device.jm_nvme_bdev_list:
@@ -1480,6 +1489,8 @@ def restart_storage_node(
                         'net_type': device['net_type']}))
             snode.data_nics = data_nics
             snode.hostname = node_info['hostname']
+        else:
+            node_ip = None
 
     logger.info(f"Restarting Storage node: {snode.mgmt_ip}")
     snode_api = SNodeClient(snode.api_endpoint, timeout=5*60, retry=3)
@@ -1675,6 +1686,7 @@ def restart_storage_node(
     known_devices_sn = []
     devices_sn = [d.serial_number for d in nvme_devs]
     for db_dev in snode.nvme_devices:
+        # if db_dev.status != NVMeDevice.STATUS_NEW:
         known_devices_sn.append(db_dev.serial_number)
         if db_dev.status == NVMeDevice.STATUS_FAILED_AND_MIGRATED:
             continue
@@ -1703,9 +1715,9 @@ def restart_storage_node(
     if node_ip:
         # prepare devices on new node
         if snode.num_partitions_per_dev == 0 or snode.jm_percent == 0:
-            ret = _prepare_cluster_devices_jm_on_dev(snode, nvme_devs)
+            ret = _prepare_cluster_devices_jm_on_dev(snode, nvme_devs, without_jm=False)
         else:
-            ret = _prepare_cluster_devices_partitions(snode, nvme_devs)
+            ret = _prepare_cluster_devices_partitions(snode, nvme_devs, without_jm=False)
         if not ret:
             logger.error("Failed to prepare cluster devices")
             # return False
@@ -2059,6 +2071,9 @@ def resume_storage_node(node_id):
     logger.info("Connecting to remote devices")
     snode = db_controller.get_storage_node_by_id(node_id)
     snode.remote_devices = _connect_to_remote_devs(snode)
+    if snode.enable_ha_jm:
+        snode.remote_jm_devices = _connect_to_remote_jm_devs(snode)
+
     snode.write_to_db(db_controller.kv_store)
 
     rpc_client = RPCClient(
@@ -2655,7 +2670,7 @@ def get_next_ha_jms(current_node):
 
 def get_node_jm_names(current_node):
     jm_list = []
-    if current_node.jm_device:
+    if current_node.jm_device and current_node.jm_device.status == JMDevice.STATUS_ONLINE:
         jm_list.append(current_node.jm_device.jm_bdev)
     else:
         jm_list.append("JM_LOCAL")
@@ -2680,6 +2695,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
         online_jms = get_next_ha_jms(snode)
         logger.debug(f"online_jms: {str(online_jms)}")
         snode.remote_jm_devices = _connect_to_remote_jm_devs(snode, online_jms)
+        snode.jm_vuid = jm_vuid
         snode.write_to_db()
 
     for _ in range(snode.number_of_distribs):
@@ -2784,6 +2800,11 @@ def _create_bdev_stack(snode, lvstore_stack=None):
             ret = rpc_client.bdev_PT_NoExcl_create(**params)
 
         elif type == "bdev_raid":
+            # sync jm
+            if snode.jm_vuid:
+                ret = rpc_client.jc_explicit_synchronization(snode.jm_vuid)
+                logger.info(f"JM Sync res: {ret}")
+                time.sleep(10)
             distribs_list = bdev["distribs_list"]
             strip_size_kb = params["strip_size_kb"]
             ret = rpc_client.bdev_raid_create(name, distribs_list, strip_size_kb=strip_size_kb)
@@ -2874,13 +2895,25 @@ def make_sec_new_primary(node_id):
         logger.error(f"snode not found: {node_id}")
         return False
 
+    dev_order = get_next_cluster_device_order(db_controller, snode.cluster_id)
     for dev in snode.nvme_devices:
-        if dev.status == NVMeDevice.STATUS_REMOVED:
-            device_controller.device_set_failed(dev.get_id())
+        if dev.status == NVMeDevice.STATUS_NEW:
+            dev.cluster_device_order = dev_order
+            dev_order += 1
+    snode.write_to_db()
 
     for dev in snode.nvme_devices:
         if dev.status == NVMeDevice.STATUS_NEW:
-            device_controller.add_device(dev.get_id())
+            device_controller.device_set_state(dev.get_id(), NVMeDevice.STATUS_ONLINE)
+            tasks_controller.add_new_device_mig_task(dev.get_id())
+
+    for node in db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id):
+        if node.status == StorageNode.STATUS_ONLINE:
+            send_cluster_map(node.get_id())
+
+    for dev in snode.nvme_devices:
+        if dev.status == NVMeDevice.STATUS_REMOVED:
+            device_controller.device_set_failed(dev.get_id())
 
     snode = db_controller.get_storage_node_by_id(node_id)
     snode.primary_ip = snode.mgmt_ip
@@ -2889,29 +2922,28 @@ def make_sec_new_primary(node_id):
 
 
 def dump_lvstore(node_id):
-    return False
-    # db_controller = DBController()
-    #
-    # snode = db_controller.get_storage_node_by_id(node_id)
-    # if not snode:
-    #     logger.error(f"Can not find storage node: {node_id}")
-    #     return False
-    #
-    # if not snode.lvstore:
-    #     logger.error("Storage node does not have lvstore")
-    #     return False
-    #
-    # rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password, timeout=180)
-    # logger.info(f"Dumping lvstore data on node: {snode.get_id()}")
-    # file_name = f"LVS_dump_{snode.hostname}_{snode.lvstore}_{str(datetime.datetime.now().isoformat())}.txt"
-    # file_path = f"/etc/simplyblock/{file_name}"
-    # ret = rpc_client.bdev_lvs_dump(snode.lvstore, file_path)
-    # if not ret:
-    #     logger.error("faild to dump lvstore data")
-    #     return False
-    #
-    # logger.info(f"LVS dump file path: {file_name}")
-    # snode_api = SNodeClient(f"{snode.mgmt_ip}:5000")
-    # file_content, _ = snode_api.get_file_content(file_name)
-    #
-    # return file_content
+    db_controller = DBController()
+
+    snode = db_controller.get_storage_node_by_id(node_id)
+    if not snode:
+        logger.error(f"Can not find storage node: {node_id}")
+        return False
+
+    if not snode.lvstore:
+        logger.error("Storage node does not have lvstore")
+        return False
+
+    rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password, timeout=180)
+    logger.info(f"Dumping lvstore data on node: {snode.get_id()}")
+    file_name = f"LVS_dump_{snode.hostname}_{snode.lvstore}_{str(datetime.datetime.now().isoformat())}.txt"
+    file_path = f"/etc/simplyblock/{file_name}"
+    ret = rpc_client.bdev_lvs_dump(snode.lvstore, file_path)
+    if not ret:
+        logger.error("faild to dump lvstore data")
+        return False
+
+    logger.info(f"LVS dump file path: {file_name}")
+    snode_api = SNodeClient(f"{snode.mgmt_ip}:5000")
+    file_content, _ = snode_api.get_file_content(file_name)
+
+    return file_content

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_web/blueprints/snode_ops_k8s.py

@@ -446,3 +446,13 @@ def spdk_process_is_up():
     else:
         return utils.get_response(False, f"SPDK container is not running")
 
+
+@bp.route('/get_file_content/<string:file_name>', methods=['GET'])
+def get_file_content(file_name):
+    out, err, _ = node_utils.run_command(f"cat /etc/simplyblock/{file_name}")
+    if out:
+        return utils.get_response(out)
+    elif err:
+        err = err.decode("utf-8")
+        logger.debug(err)
+        return utils.get_response(None, err)

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_web/blueprints/web_api_storage_node.py

@@ -198,7 +198,10 @@ def storage_node_add():
     max_snap = int(req_data.get('max_snap', 500))
     max_prov = req_data['max_prov']
     number_of_distribs = int(req_data.get('number_of_distribs', 4))
-    disable_ha_jm = bool(req_data.get('disable_ha_jm', False))
+    if req_data.get('disable_ha_jm', "") == "true":
+        disable_ha_jm = True
+    else:
+        disable_ha_jm = False
     enable_test_device = bool(req_data.get('enable_test_device', False))
 
     spdk_image = None

{sbcli_dev-4.0.64 → sbcli_dev-4.0.66}/simplyblock_web/templates/storage_deploy_spdk.yaml.j2

@@ -33,6 +33,9 @@ spec:
         - name: foundationdb
           hostPath:
             path: /etc/foundationdb
+        - name: etc-simplyblock
+          hostPath:
+            path: /etc/simplyblock
         - name: host-modules
           hostPath:
             path: /lib/modules
@@ -94,6 +97,8 @@ spec:
           mountPath: /dev
         - name: script-volume
           mountPath: /script
+        - name: etc-simplyblock
+          mountPath: /etc/simplyblock
         resources:
           limits:
             hugepages-2Mi: {{ MEM_GEGA }}Gi