sbcli-pre 1.2.11__zip → 1.2.12__zip

{sbcli_pre-1.2.11 → sbcli_pre-1.2.12}/PKG-INFO

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

{sbcli_pre-1.2.11 → sbcli_pre-1.2.12}/env_var

@@ -1,5 +1,6 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=1.2.11
+SIMPLY_BLOCK_VERSION=1.2.12
+
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:pre-release
 

{sbcli_pre-1.2.11 → sbcli_pre-1.2.12}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.2.11 → sbcli_pre-1.2.12}/simplyblock_core/constants.py

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

{sbcli_pre-1.2.11 → sbcli_pre-1.2.12}/simplyblock_core/controllers/caching_node_controller.py

@@ -362,7 +362,7 @@ def connect(caching_node_id, lvol_id):
     if lvol.ha_type == 'single':
         snode = db_controller.get_storage_node_by_id(lvol.node_id)
         for nic in snode.data_nics:
-            ret = rpc_client.bdev_nvme_attach_controller_tcp(rem_name, lvol.nqn, nic.ip4_address, "4420")
+            ret = rpc_client.bdev_nvme_attach_controller_tcp_caching(rem_name, lvol.nqn, nic.ip4_address, "4420")
             logger.debug(ret)
             if not ret:
                 logger.error("Failed to connect to LVol")
@@ -372,7 +372,7 @@ def connect(caching_node_id, lvol_id):
         for nodes_id in lvol.nodes:
             snode = db_controller.get_storage_node_by_id(nodes_id)
             for nic in snode.data_nics:
-                ret = rpc_client.bdev_nvme_attach_controller_tcp(rem_name, lvol.nqn, nic.ip4_address, "4420")
+                ret = rpc_client.bdev_nvme_attach_controller_tcp_caching(rem_name, lvol.nqn, nic.ip4_address, "4420")
                 logger.debug(ret)
                 # if not ret:
                 #     logger.error("Failed to connect to LVol")

{sbcli_pre-1.2.11 → sbcli_pre-1.2.12}/simplyblock_core/controllers/lvol_controller.py

@@ -1027,12 +1027,15 @@ def delete_lvol(id_or_name, force_delete=False):
                 return False
 
     # remove from storage node
-    snode.lvols.remove(lvol.get_id())
-    snode.write_to_db(db_controller.kv_store)
+    if lvol.get_id() in snode.lvols:
+        snode.lvols.remove(lvol.get_id())
+        snode.write_to_db(db_controller.kv_store)
 
     # remove from pool
-    pool.lvols.remove(lvol.get_id())
-    pool.write_to_db(db_controller.kv_store)
+    if lvol.get_id() in pool.lvols:
+        pool.lvols.remove(lvol.get_id())
+        pool.write_to_db(db_controller.kv_store)
+
     lvol_events.lvol_delete(lvol)
     lvol.remove(db_controller.kv_store)
 

{sbcli_pre-1.2.11 → sbcli_pre-1.2.12}/simplyblock_core/rpc_client.py

@@ -440,6 +440,17 @@ class RPCClient:
         }
         return self._request("bdev_nvme_attach_controller", params)
 
+    def bdev_nvme_attach_controller_tcp_caching(self, name, nqn, ip, port):
+        params = {
+            "name": name,
+            "trtype": "tcp",
+            "traddr": ip,
+            "adrfam": "ipv4",
+            "trsvcid": str(port),
+            "subnqn": nqn
+        }
+        return self._request("bdev_nvme_attach_controller", params)
+
     def bdev_split(self, base_bdev, split_count):
         params = {
             "base_bdev": base_bdev,

{sbcli_pre-1.2.11 → sbcli_pre-1.2.12}/simplyblock_core/scripts/deploy_stack.sh

@@ -23,10 +23,10 @@ docker network create monitoring-net -d overlay --attachable
 
 INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id)
 
-if [ -n "$INSTANCE_ID" ] 
-then
-  export USE_EFS="rexray/efs"
-fi
+#if [ -n "$INSTANCE_ID" ]
+#then
+#  export USE_EFS="rexray/efs"
+#fi
 
 docker stack deploy --compose-file="$DIR"/docker-compose-swarm-monitoring.yml monitoring
 

{sbcli_pre-1.2.11 → sbcli_pre-1.2.12}/simplyblock_web/blueprints/web_api_storage_node.py

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 import logging
-import time
+import threading
 
 from flask import Blueprint, request
 
@@ -146,8 +146,12 @@ def storage_node_restart(uuid):
     if not node:
         return utils.get_response_error(f"node not found: {uuid}", 404)
 
-    out = storage_node_ops.restart_storage_node(uuid)
-    return utils.get_response(out)
+    threading.Thread(
+        target=storage_node_ops.restart_storage_node,
+        args=(uuid,)
+    ).start()
+
+    return utils.get_response(True)
 
 
 @bp.route('/storagenode/add', methods=['POST'])