sbcli-dev 6.0.2__tar.gz → 6.0.4__tar.gz

{sbcli_dev-6.0.2 → sbcli_dev-6.0.4}/PKG-INFO

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

{sbcli_dev-6.0.2 → sbcli_dev-6.0.4}/env_var

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

{sbcli_dev-6.0.2 → sbcli_dev-6.0.4}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-6.0.2 → sbcli_dev-6.0.4}/simplyblock_core/controllers/device_controller.py

@@ -754,7 +754,7 @@ def set_jm_device_state(device_id, state):
         # make other nodes connect to the new devices
         snodes = db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id)
         for node_index, node in enumerate(snodes):
-            if node.get_id() == snode.get_id() or node.status != StorageNode.STATUS_ONLINE:
+            if node.status != StorageNode.STATUS_ONLINE:
                 continue
             logger.info(f"Connecting to node: {node.get_id()}")
             node.remote_jm_devices = storage_node_ops._connect_to_remote_jm_devs(node)

{sbcli_dev-6.0.2 → sbcli_dev-6.0.4}/simplyblock_core/models/storage_node.py

@@ -123,6 +123,7 @@ class StorageNode(BaseModel):
         "namespace": {"type": str, "default": ""},
 
         "is_secondary_node": {"type": bool, "default": False},
+        "online_since": {"type": str, "default": ""},
 
     }
 

{sbcli_dev-6.0.2 → sbcli_dev-6.0.4}/simplyblock_core/services/tasks_runner_migration.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 import time
-
+from datetime import datetime
 
 from simplyblock_core import constants, kv_store, utils
 from simplyblock_core.controllers import tasks_events, tasks_controller
@@ -42,6 +42,15 @@ def task_runner(task):
         task.write_to_db(db_controller.kv_store)
         return False
 
+    if snode.online_since:
+        diff = datetime.now() - datetime.fromisoformat(snode.online_since)
+        if diff.total_seconds() < 60 * 5:
+            task.function_result = "node is online < 5 min, retrying"
+            task.status = JobSchedule.STATUS_SUSPENDED
+            task.retry += 1
+            task.write_to_db(db_controller.kv_store)
+            return False
+
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password,
                            timeout=5, retry=2)
     if "migration" not in task.function_params:

{sbcli_dev-6.0.2 → sbcli_dev-6.0.4}/simplyblock_core/storage_node_ops.py

@@ -1893,11 +1893,8 @@ def restart_storage_node(
     if snode.lvstore_stack or snode.is_secondary_node:
         ret = recreate_lvstore(snode)
         if not ret:
-            return False, "Failed to recreate lvstore on node"
-
-        # logger.info("Dumping lvstore data")
-        # ret = dump_lvstore(node_id)
-        # print(ret)
+            logger.error("Failed to recreate lvstore")
+            return False
 
     time.sleep(4)
 
@@ -1924,12 +1921,20 @@ def list_storage_nodes(is_json, cluster_id=None):
         nodes = db_controller.get_storage_nodes()
     data = []
     output = ""
+    now = datetime.datetime.now()
 
     for node in nodes:
         logger.debug(node)
         logger.debug("*" * 20)
         total_devices = len(node.nvme_devices)
         online_devices = 0
+        uptime = ""
+        if node.online_since:
+            try:
+                uptime = utils.strfdelta((now - datetime.datetime.fromisoformat(node.online_since)))
+            except:
+                pass
+
         for dev in node.nvme_devices:
             if dev.status == NVMeDevice.STATUS_ONLINE:
                 online_devices += 1
@@ -1941,7 +1946,7 @@ def list_storage_nodes(is_json, cluster_id=None):
             "LVols": f"{len(node.lvols)}",
             "Status": node.status,
             "Health": node.health_check,
-
+            "Up time": uptime,
             "Cloud ID": node.cloud_instance_id,
             "Cloud Type": node.cloud_instance_type,
             "Ext IP": node.cloud_instance_public_ip,
@@ -2823,6 +2828,8 @@ def set_node_status(node_id, status):
         old_status = snode.status
         snode.status = status
         snode.updated_at = str(datetime.datetime.now())
+        if status == StorageNode.STATUS_ONLINE:
+            snode.online_since = str(datetime.datetime.now())
         snode.write_to_db(db_controller.kv_store)
         storage_events.snode_status_change(snode, snode.status, old_status, caused_by="monitor")
         distr_controller.send_node_status_event(snode, status)
@@ -2911,6 +2918,8 @@ def recreate_lvstore_on_sec(snode, primary_node=None):
                             ret = rpc_client.nvmf_subsystem_listener_set_ana_state(
                                 lvol.nqn, iface.ip4_address, "4420", False)
 
+    return True
+
 
 def recreate_lvstore(snode):
     db_controller = DBController(KVStore())

{sbcli_dev-6.0.2 → sbcli_dev-6.0.4}/simplyblock_core/utils.py

@@ -639,3 +639,51 @@ def nearest_upper_power_of_2(n):
         return n
     # Otherwise, return the nearest upper power of 2
     return 1 << n.bit_length()
+
+
+def strfdelta(tdelta, fmt='{D:02}d {H:02}h {M:02}m {S:02}s', inputtype='timedelta'):
+    """Convert a datetime.timedelta object or a regular number to a custom-
+    formatted string, just like the stftime() method does for datetime.datetime
+    objects.
+
+    The fmt argument allows custom formatting to be specified.  Fields can
+    include seconds, minutes, hours, days, and weeks.  Each field is optional.
+
+    Some examples:
+        '{D:02}d {H:02}h {M:02}m {S:02}s' --> '05d 08h 04m 02s' (default)
+        '{W}w {D}d {H}:{M:02}:{S:02}'     --> '4w 5d 8:04:02'
+        '{D:2}d {H:2}:{M:02}:{S:02}'      --> ' 5d  8:04:02'
+        '{H}h {S}s'                       --> '72h 800s'
+
+    The inputtype argument allows tdelta to be a regular number instead of the
+    default, which is a datetime.timedelta object.  Valid inputtype strings:
+        's', 'seconds',
+        'm', 'minutes',
+        'h', 'hours',
+        'd', 'days',
+        'w', 'weeks'
+    """
+
+    # Convert tdelta to integer seconds.
+    if inputtype == 'timedelta':
+        remainder = int(tdelta.total_seconds())
+    elif inputtype in ['s', 'seconds']:
+        remainder = int(tdelta)
+    elif inputtype in ['m', 'minutes']:
+        remainder = int(tdelta)*60
+    elif inputtype in ['h', 'hours']:
+        remainder = int(tdelta)*3600
+    elif inputtype in ['d', 'days']:
+        remainder = int(tdelta)*86400
+    elif inputtype in ['w', 'weeks']:
+        remainder = int(tdelta)*604800
+
+    f = string.Formatter()
+    desired_fields = [field_tuple[1] for field_tuple in f.parse(fmt)]
+    possible_fields = ('W', 'D', 'H', 'M', 'S')
+    constants = {'W': 604800, 'D': 86400, 'H': 3600, 'M': 60, 'S': 1}
+    values = {}
+    for field in possible_fields:
+        if field in desired_fields and field in constants:
+            values[field], remainder = divmod(remainder, constants[field])
+    return f.format(fmt, **values)