sbcli-dev 3.8.53__zip → 3.8.55__zip

{sbcli_dev-3.8.53 → sbcli_dev-3.8.55}/PKG-INFO

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

{sbcli_dev-3.8.53 → sbcli_dev-3.8.55}/env_var

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

{sbcli_dev-3.8.53 → sbcli_dev-3.8.55}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.53 → sbcli_dev-3.8.55}/simplyblock_cli/cli.py

@@ -295,6 +295,7 @@ class CLIWrapper:
         # Activate cluster
         sub_command = self.add_sub_command(subparser, 'activate', 'Create distribs and raid0 bdevs on all the storage node and move the cluster to active state')
         sub_command.add_argument("cluster_id", help='the cluster UUID')
+        sub_command.add_argument("--force", help='Force recreate distr and lv stores', required=False, action='store_true')
 
         # show cluster list
         self.add_sub_command(subparser, 'list', 'Show clusters list')
@@ -889,7 +890,7 @@ class CLIWrapper:
                 ret = self.cluster_add(args)
             elif sub_command == 'activate':
                 cluster_id = args.cluster_id
-                ret = cluster_ops.cluster_activate(cluster_id)
+                ret = cluster_ops.cluster_activate(cluster_id, args.force)
             elif sub_command == 'status':
                 cluster_id = args.cluster_id
                 ret = cluster_ops.show_cluster(cluster_id)

{sbcli_dev-3.8.53 → sbcli_dev-3.8.55}/simplyblock_core/cluster_ops.py

@@ -336,7 +336,7 @@ def add_cluster(blk_size, page_size_in_blocks, cap_warn, cap_crit, prov_cap_warn
     return cluster.get_id()
 
 
-def cluster_activate(cl_id):
+def cluster_activate(cl_id, force=False):
     db_controller = DBController()
     cluster = db_controller.get_cluster_by_id(cl_id)
     if not cluster:
@@ -344,7 +344,8 @@ def cluster_activate(cl_id):
         return False
     if cluster.status != Cluster.STATUS_UNREADY:
         logger.error(f"Failed to activate cluster, Cluster is not in an UNREADY state")
-        return False
+        if not force:
+            return False
     set_cluster_status(cl_id, Cluster.STATUS_IN_ACTIVATION)
     snodes = db_controller.get_storage_nodes_by_cluster_id(cl_id)
     online_nodes = []
@@ -367,7 +368,8 @@ def cluster_activate(cl_id):
     for snode in snodes:
         if snode.lvstore:
             logger.info(f"Node {snode.get_id()} already has lvstore {snode.lvstore}... skipping")
-            continue
+            if not force:
+                continue
         ret = storage_node_ops.create_lvstore(snode, cluster.distr_ndcs, cluster.distr_npcs, cluster.distr_bs,
                                               cluster.distr_chunk_bs, cluster.page_size_in_blocks, max_size, snodes)
         if not ret:
@@ -375,9 +377,9 @@ def cluster_activate(cl_id):
             set_cluster_status(cl_id, Cluster.STATUS_UNREADY)
             return False
 
-    cluster.status = Cluster.STATUS_ACTIVE
     cluster.cluster_max_size = max_size
     cluster.write_to_db(db_controller.kv_store)
+    set_cluster_status(cl_id, Cluster.STATUS_ACTIVE)
     logger.info("Cluster activated successfully")
     return True
 

{sbcli_dev-3.8.53 → sbcli_dev-3.8.55}/simplyblock_core/distr_controller.py

@@ -123,7 +123,7 @@ def get_distr_cluster_map(snodes, target_node):
         "timestamp": datetime.datetime.now().isoformat("T", "seconds")+'Z',
         "map_cluster": map_cluster,
         "map_prob": map_prob,
-        'ppln1': local_node_index
+        # 'ppln1': local_node_index
     }
     return cl_map