sbcli-pre 1.3.5__zip → 1.3.7__zip

{sbcli_pre-1.3.5 → sbcli_pre-1.3.7}/PKG-INFO

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

{sbcli_pre-1.3.5 → sbcli_pre-1.3.7}/env_var

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

{sbcli_pre-1.3.5 → sbcli_pre-1.3.7}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.3.5 → sbcli_pre-1.3.7}/sbcli_pre.egg-info/SOURCES.txt

@@ -62,6 +62,7 @@ simplyblock_core/models/storage_node.py
 simplyblock_core/scripts/__init__.py
 simplyblock_core/scripts/clean_local_storage_deploy.sh
 simplyblock_core/scripts/config_docker.sh
+simplyblock_core/scripts/dashboard.yml
 simplyblock_core/scripts/datasource.yml
 simplyblock_core/scripts/db_config_double.sh
 simplyblock_core/scripts/db_config_single.sh
@@ -70,6 +71,7 @@ simplyblock_core/scripts/docker-compose-swarm-monitoring.yml
 simplyblock_core/scripts/docker-compose-swarm.yml
 simplyblock_core/scripts/haproxy.cfg
 simplyblock_core/scripts/install_deps.sh
+simplyblock_core/scripts/objstore.yml
 simplyblock_core/scripts/prometheus.yml
 simplyblock_core/scripts/run_ssh.sh
 simplyblock_core/scripts/set_db_config.sh

{sbcli_pre-1.3.5 → sbcli_pre-1.3.7}/simplyblock_core/cluster_ops.py

@@ -23,28 +23,6 @@ from simplyblock_core.models.storage_node import StorageNode
 logger = logging.getLogger()
 TOP_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 
-def _add_grafana_dashboards(username, password, cluster_ip):
-    url = f"http://{username}:{password}@{cluster_ip}/grafana/api/dashboards/import"
-    headers = {'Content-Type': 'application/json'}
-    dirpath, _, filenames = next(os.walk(os.path.join(constants.INSTALL_DIR, "scripts", "dashboards")))
-    ret = True
-    for filename in filenames:
-        with open(os.path.join(dirpath, filename), 'r') as f:
-            st = f.read()
-            # st = st.replace("$Cluster", cluster_id)
-            st = json.loads(st)
-        payload = json.dumps(st)
-        response = requests.post(url, headers=headers, data=payload)
-        logger.debug(response.status_code)
-        logger.debug(response.text)
-        if response.status_code == 200:
-            resp = response.json()
-            logger.info(f"Dashboard: {resp['title']}, imported: {resp['imported']}")
-        else:
-            logger.error(f"Error importing dashboard, status code:{response.status_code} text:{response.text}")
-            ret = False
-    return ret
-
 
 def _add_graylog_input(cluster_ip, password):
     url = f"http://{cluster_ip}/graylog/api/system/inputs"
@@ -187,10 +165,6 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
 
     mgmt_node_ops.add_mgmt_node(DEV_IP, c.uuid)
 
-    logger.info("Applying dashboard...")
-    ret = _add_grafana_dashboards("admin", c.secret, DEV_IP)
-    logger.info(f"Applying dashboard > {ret}")
-
     logger.info("New Cluster has been created")
     logger.info(c.uuid)
     return c.uuid

{sbcli_pre-1.3.5 → sbcli_pre-1.3.7}/simplyblock_core/controllers/device_controller.py

@@ -194,6 +194,12 @@ def restart_device(device_id, force=False):
             device_obj = dev
             break
 
+    task_id = tasks_controller.get_active_dev_restart_task(snode.cluster_id, device_id)
+    if task_id:
+        logger.error(f"Restart task found: {task_id}, can not restart device")
+        if force is False:
+            return False
+
     logger.info(f"Restarting device {device_id}")
     device_set_unavailable(device_id)
 
@@ -280,6 +286,12 @@ def device_remove(device_id, force=True):
             device = dev
             break
 
+    task_id = tasks_controller.get_active_dev_restart_task(snode.cluster_id, device_id)
+    if task_id:
+        logger.error(f"Restart task found: {task_id}, can not remove device")
+        if force is False:
+            return False
+
     logger.info("Sending device event")
     distr_controller.send_dev_status_event(device, NVMeDevice.STATUS_REMOVED)
 
@@ -418,6 +430,11 @@ def reset_storage_device(dev_id):
         logger.error(f"Device status: {device.status} is removed")
         return False
 
+    task_id = tasks_controller.get_active_dev_restart_task(snode.cluster_id, dev_id)
+    if task_id:
+        logger.error(f"Restart task found: {task_id}, can not reset device")
+        return False
+
     logger.info("Setting devices to unavailable")
     device_set_unavailable(dev_id)
     devs = []

{sbcli_pre-1.3.5 → sbcli_pre-1.3.7}/simplyblock_core/controllers/health_controller.py

@@ -164,7 +164,7 @@ def check_node(node_id, with_devices=True):
                 logger.info(f"Checking bdev: {remote_device.remote_bdev} ... ok")
             else:
                 logger.info(f"Checking bdev: {remote_device.remote_bdev} ... not found")
-            node_remote_devices_check &= bool(ret)
+            # node_remote_devices_check &= bool(ret)
 
     return is_node_online and node_devices_check and node_remote_devices_check
 

{sbcli_pre-1.3.5 → sbcli_pre-1.3.7}/simplyblock_core/controllers/tasks_controller.py

@@ -10,17 +10,6 @@ from simplyblock_core.models.job_schedule import JobSchedule
 logger = logging.getLogger()
 db_controller = kv_store.DBController()
 
-
-def _validate_new_task_node_restart(cluster_id, node_id):
-    tasks = db_controller.get_job_tasks(cluster_id)
-    for task in tasks:
-        if task.function_name == JobSchedule.FN_NODE_RESTART and task.node_id == node_id:
-            if task.status != JobSchedule.STATUS_DONE:
-                logger.info(f"Task found, skip adding new task: {task.get_id()}")
-                return False
-    return True
-
-
 def _validate_new_task_dev_restart(cluster_id, node_id, device_id):
     tasks = db_controller.get_job_tasks(cluster_id)
     for task in tasks:
@@ -41,7 +30,9 @@ def _add_task(function_name, cluster_id, node_id, device_id):
         if not _validate_new_task_dev_restart(cluster_id, node_id, device_id):
             return False
     elif function_name == JobSchedule.FN_NODE_RESTART:
-        if not _validate_new_task_node_restart(cluster_id, node_id):
+        task_id = get_active_node_restart_task(cluster_id, node_id)
+        if task_id:
+            logger.info(f"Task found, skip adding new task: {task_id}")
             return False
 
     task_obj = JobSchedule()
@@ -101,3 +92,21 @@ def cancel_task(task_id):
     task.write_to_db(db_controller.kv_store)
     tasks_events.task_canceled(task)
     return True
+
+
+def get_active_node_restart_task(cluster_id, node_id):
+    tasks = db_controller.get_job_tasks(cluster_id)
+    for task in tasks:
+        if task.function_name == JobSchedule.FN_NODE_RESTART and task.node_id == node_id:
+            if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
+                return task.uuid
+    return False
+
+
+def get_active_dev_restart_task(cluster_id, device_id):
+    tasks = db_controller.get_job_tasks(cluster_id)
+    for task in tasks:
+        if task.function_name == JobSchedule.FN_DEV_RESTART and task.device_id == device_id:
+            if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
+                return task.uuid
+    return False

sbcli_pre-1.3.7/simplyblock_core/scripts/dashboard.yml

@@ -0,0 +1,12 @@
+apiVersion: 1
+
+providers:
+  - name: "Dashboard provider"
+    orgId: 1
+    type: file
+    disableDeletion: false
+    updateIntervalSeconds: 10
+    allowUiUpdates: false
+    options:
+      path: /var/lib/grafana/dashboards
+      foldersFromFilesStructure: true