sbcli-dev 10.2.2__tar.gz → 10.2.4__tar.gz

{sbcli_dev-10.2.2 → sbcli_dev-10.2.4}/PKG-INFO

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

{sbcli_dev-10.2.2 → sbcli_dev-10.2.4}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.2.2 → sbcli_dev-10.2.4}/simplyblock_core/controllers/snapshot_controller.py

@@ -382,7 +382,7 @@ def clone(snapshot_id, clone_name, new_size=0):
             return False, msg
         lvol.size = new_size
 
-    rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
+    lvol.write_to_db(db_controller.kv_store)
 
     if snap.lvol.ha_type == 'single':
         ret, error = lvol_controller.add_lvol_on_node(lvol, snode)
@@ -407,23 +407,8 @@ def clone(snapshot_id, clone_name, new_size=0):
             snode.get_id(),
             snode.secondary_node_id]
         lvol.nodes = nodes_ids
-##########################################################################################################
-    # spdk_mem_info_after = rpc_client.ultra21_util_get_malloc_stats()
-    # diff = {}
-    # for key in spdk_mem_info_after.keys():
-    #     diff[key] = spdk_mem_info_after[key] - spdk_mem_info_before[key]
-    #
-    # logger.info("spdk mem diff:")
-    # logger.info(json.dumps(diff, indent=2))
-    # lvol.mem_diff = diff
-    # lvol.write_to_db(db_controller.kv_store)
-
-    # pool = db_controller.get_pool_by_id(snap.lvol.pool_uuid)
-    # pool.lvols += 1
-    # pool.write_to_db(db_controller.kv_store)
-    # snode = db_controller.get_storage_node_by_id(snode.get_id())
-    # snode.lvols += 1
-    # snode.write_to_db(db_controller.kv_store)
+
+    lvol.write_to_db(db_controller.kv_store)
 
     if snap.snap_ref_id:
         ref_snap = db_controller.get_snapshot_by_id(snap.snap_ref_id)

{sbcli_dev-10.2.2 → sbcli_dev-10.2.4}/simplyblock_core/env_var

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

{sbcli_dev-10.2.2 → sbcli_dev-10.2.4}/simplyblock_core/storage_node_ops.py

@@ -1206,12 +1206,12 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     snode.num_partitions_per_dev = num_partitions_per_dev
     snode.jm_percent = jm_percent
 
-    snode.write_to_db(kv_store)
+    time.sleep(10)
 
     # creating RPCClient instance
     rpc_client = RPCClient(
         snode.mgmt_ip, snode.rpc_port,
-        snode.rpc_username, snode.rpc_password, timeout=3*60, retry=3)
+        snode.rpc_username, snode.rpc_password, timeout=3*60, retry=10)
 
     # 1- set iobuf options
     if (snode.iobuf_small_pool_count or snode.iobuf_large_pool_count or
@@ -1225,6 +1225,8 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     rpc_client.bdev_set_options(0, 0, 0, 0)
     rpc_client.accel_set_options()
 
+    snode.write_to_db(kv_store)
+
     ret = rpc_client.nvmf_set_max_subsystems(constants.NVMF_MAX_SUBSYSTEMS)
     if not ret:
         logger.warning(f"Failed to set nvmf max subsystems {constants.NVMF_MAX_SUBSYSTEMS}")