sbcli-dev 17.4.2__tar.gz → 17.4.3__tar.gz

{sbcli_dev-17.4.2 → sbcli_dev-17.4.3}/PKG-INFO

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

{sbcli_dev-17.4.2 → sbcli_dev-17.4.3}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-17.4.2 → sbcli_dev-17.4.3}/sbcli_dev.egg-info/SOURCES.txt

@@ -89,6 +89,10 @@ simplyblock_core/scripts/dashboards/lvols.json
 simplyblock_core/scripts/dashboards/node-exporter.json
 simplyblock_core/scripts/dashboards/nodes.json
 simplyblock_core/scripts/dashboards/pools.json
+simplyblock_core/scripts/helpers/__init__.py
+simplyblock_core/scripts/helpers/deploy_cluster.sh
+simplyblock_core/scripts/helpers/destroy_cluster.sh
+simplyblock_core/scripts/helpers/nvme_disconnect_by_ip.py
 simplyblock_core/services/__init__.py
 simplyblock_core/services/cached_lvol_stat_collector.py
 simplyblock_core/services/caching_node_monitor.py

{sbcli_dev-17.4.2 → sbcli_dev-17.4.3}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=17.4.2
+SIMPLY_BLOCK_VERSION=17.4.3
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:main-latest

sbcli_dev-17.4.3/simplyblock_core/scripts/helpers/deploy_cluster.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+P_NODES=("192.168.10.92" "192.168.10.93" "192.168.10.94")
+
+CMD=$(ls /usr/local/bin/sbcli-* | awk '{n=split($0,a,"/"); print a[n]}')
+cl=$($CMD cluster list | tail -n -3 | awk '{print $2}')
+$CMD -d cluster add --ha-type ha
+$CMD cluster delete $cl
+cl=$($CMD cluster list | tail -n -3 | awk '{print $2}')
+
+for sn_id in "${P_NODES[@]}"; do
+
+  $CMD -d --dev sn add-node $cl $sn_id:5000 eth0 --journal-partition 0  --number-of-devices 1 --max-lvol 1  \
+      --max-size 1g --data-nics eth1  --vcpu-count 6 --ssd-pcie 0000:00:02.0 0000:00:03.0 0000:00:04.0 0000:00:05.0
+
+#  $CMD -d --dev sn add-node $cl $sn_id:5000 eth0 --journal-partition 0  --number-of-devices 1 --max-lvol 1  \
+#      --max-size 1g --data-nics eth1  --vcpu-count 2 --ssd-pcie 0000:00:02.0 0000:00:03.0  --spdk-mem 6g
+#
+#  $CMD -d --dev sn add-node $cl $sn_id:5000 eth0 --journal-partition 0  --number-of-devices 1 --max-lvol 1  \
+#      --max-size 1g --data-nics eth1  --vcpu-count 2 --ssd-pcie 0000:00:04.0 0000:00:05.0 --spdk-mem 6g
+done
+
+$CMD -d pool add pool1 $cl
+$CMD -d cluster activate $cl

sbcli_dev-17.4.3/simplyblock_core/scripts/helpers/destroy_cluster.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+# destroy cluster
+
+CMD=$(ls /usr/local/bin/sbcli-* | awk '{n=split($0,a,"/"); print a[n]}')
+cl=$($CMD cluster list | tail -n -3 | awk '{print $2}')
+
+for sn_id in $($CMD lvol list | grep line | awk '{print $2}'); do
+  $CMD -d lvol delete $sn_id --force
+done
+for sn_id in $($CMD sn list | grep online | awk '{print $2}'); do
+  $CMD -d sn shutdown --force $sn_id
+done
+for task_id in $($CMD -d cluster list-tasks $cl | grep -i mig | grep -v done  | awk '{print $2}'); do
+  $CMD cluster cancel-task $task_id
+  $CMD cluster cancel-task $task_id
+done
+for sn_id in $($CMD sn list | grep / | awk '{print $2}'); do
+  $CMD sn remove $sn_id --force-remove --force
+done
+for task_id in $($CMD -d cluster list-tasks $cl | grep -i mig | grep -v done  | awk '{print $2}'); do
+  $CMD cluster cancel-task $task_id
+  $CMD cluster cancel-task $task_id
+done
+for sn_id in $($CMD sn list | grep / | awk '{print $2}'); do
+  $CMD sn delete $sn_id
+done
+
+for sn_id in $($CMD pool list | grep active | awk '{print $2}'); do
+  $CMD pool delete $sn_id
+done

sbcli_dev-17.4.3/simplyblock_core/scripts/helpers/nvme_disconnect_by_ip.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+# encoding: utf-8
+import json
+import logging
+import os
+import subprocess
+import sys
+
+logger = logging.getLogger(__name__)
+
+
+def run_command(cmd):
+    try:
+        process = subprocess.Popen(
+            cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = process.communicate()
+        return stdout.strip().decode("utf-8"), stderr.strip(), process.returncode
+    except Exception as e:
+        return "", str(e), 1
+
+
+def disconnect_by_ip(node_ip):
+    out, err, rc = run_command("nvme list -v -o json")
+    if rc != 0:
+        logger.error("Error getting nvme list")
+        logger.error(err)
+        return []
+    data = json.loads(out)
+    devices = []
+    if data and 'Devices' in data and data['Devices']:
+        for dev in data['Devices'][0]['Subsystems']:
+            if 'Controllers' in dev and dev['Controllers']:
+                for controller in dev['Controllers']:
+                    adr = controller['Address']
+                    if node_ip in adr:
+                        devices.append(controller)
+
+    logger.info(f"Found {len(devices)} controllers")
+    for dev in devices:
+        out, err, rc = run_command(f"nvme disconnect -d {dev['Controller']}")
+        if rc != 0:
+            logger.error(f"Error disconnecting {dev['Controller']}")
+            logger.error(err)
+
+
+if __name__ == '__main__':
+    disconnect_by_ip(sys.argv[1])

{sbcli_dev-17.4.2 → sbcli_dev-17.4.3}/simplyblock_core/storage_node_ops.py

@@ -1891,7 +1891,7 @@ def restart_storage_node(
     for node in snodes:
         if node.get_id() == snode.get_id() or node.status != StorageNode.STATUS_ONLINE:
             continue
-        node.remote_devices = _connect_to_remote_devs(node)
+        node.remote_devices = _connect_to_remote_devs(node, force_conect_restarting_nodes=True)
         node.write_to_db(kv_store)
 
     logger.info(f"Sending device status event")