sbcli-dev 3.8.52__zip → 3.8.54__zip

{sbcli_dev-3.8.52 → sbcli_dev-3.8.54}/PKG-INFO

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

{sbcli_dev-3.8.52 → sbcli_dev-3.8.54}/env_var

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

{sbcli_dev-3.8.52 → sbcli_dev-3.8.54}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.52 → sbcli_dev-3.8.54}/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.52 → sbcli_dev-3.8.54}/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.52 → sbcli_dev-3.8.54}/simplyblock_core/distr_controller.py

@@ -86,9 +86,9 @@ def get_distr_cluster_map(snodes, target_node):
             dev_w = int(dev.size/(1024*1024*1024)) or 1
             node_w += dev_w
             name = None
+            dev_status = dev.status
             if snode.get_id() == target_node.get_id():
                 name = dev.alceml_bdev
-                dev_status = dev.status
                 local_node_index = index
             else:
                 for dev2 in target_node.remote_devices:
@@ -98,7 +98,6 @@ def get_distr_cluster_map(snodes, target_node):
                         break
             if not name:
                 name = f"remote_{dev.alceml_bdev}n1"
-                dev_status = NVMeDevice.STATUS_UNAVAILABLE
             dev_map[dev.cluster_device_order] = {
                 "UUID": dev.get_id(),
                 "bdev_name": name,

{sbcli_dev-3.8.52 → sbcli_dev-3.8.54}/simplyblock_core/services/spdk_http_proxy_server.py

@@ -8,14 +8,11 @@ import socket
 import ssl
 import sys
 
-try:
-    from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
-except ImportError:
-    from http.server import HTTPServer
-    from http.server import BaseHTTPRequestHandler
+from http.server import ThreadingHTTPServer
+from http.server import BaseHTTPRequestHandler
+
 
-TIMEOUT = 30
-TIMEOUT_LONG = 5*60  # 5 min
+TIMEOUT = 5*60  # 5 min
 rpc_sock = '/var/tmp/spdk.sock'
 logger_handler = logging.StreamHandler(stream=sys.stdout)
 logger_handler.setFormatter(logging.Formatter('%(asctime)s: %(levelname)s: %(message)s'))
@@ -37,12 +34,8 @@ def get_env_var(name, default=None, is_required=False):
 def rpc_call(req):
     req_data = json.loads(req.decode('ascii'))
     print(req_data)
-    method = req_data['method']
     sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-    if "create" in method or "delete" in method:
-        sock.settimeout(TIMEOUT_LONG)
-    else:
-        sock.settimeout(TIMEOUT)
+    sock.settimeout(TIMEOUT)
     sock.connect(rpc_sock)
     sock.sendall(req)
 
@@ -54,7 +47,6 @@ def rpc_call(req):
     closed = False
     response = None
 
-
     while not closed:
         newdata = sock.recv(1024)
         if (newdata == b''):
@@ -135,7 +127,7 @@ def run_server(host, port, user, password, cert=None):
 
     try:
         ServerHandler.key = key
-        httpd = HTTPServer((host, port), ServerHandler)
+        httpd = ThreadingHTTPServer((host, port), ServerHandler)
         httpd.timeout = TIMEOUT
         if cert is not None:
             httpd.socket = ssl.wrap_socket(httpd.socket, certfile=cert, server_side=True)

{sbcli_dev-3.8.52 → sbcli_dev-3.8.54}/simplyblock_core/services/tasks_runner_restart.py

@@ -186,7 +186,7 @@ def task_runner_node(task):
         logger.info(f"Node restart succeeded")
 
     time.sleep(5)
-    if _get_node_unavailable_devices_count(node.get_id()) == 0 and node.status == StorageNode.STATUS_ONLINE:
+    if node.status == StorageNode.STATUS_ONLINE:
         logger.info(f"Node is online: {node.get_id()}")
         task.function_result = "done"
         task.status = JobSchedule.STATUS_DONE