sbcli-dev 3.9.4__zip → 3.9.5__zip

{sbcli_dev-3.9.4 → sbcli_dev-3.9.5}/PKG-INFO

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

{sbcli_dev-3.9.4 → sbcli_dev-3.9.5}/env_var

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

{sbcli_dev-3.9.4 → sbcli_dev-3.9.5}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.9.4 → sbcli_dev-3.9.5}/simplyblock_core/cluster_ops.py

@@ -215,8 +215,9 @@ def create_cluster(blk_size, page_size_in_blocks, cli_pass,
     shutil.rmtree(temp_dir)
 
     logger.info("Deploying swarm stack ...")
+    log_level = "DEBUG" if constants.LOG_WEB_DEBUG else "INFO"
     ret = scripts.deploy_stack(cli_pass, DEV_IP, constants.SIMPLY_BLOCK_DOCKER_IMAGE, c.secret, c.uuid,
-                               log_del_interval, metrics_retention_period)
+                               log_del_interval, metrics_retention_period, log_level=log_level)
     logger.info("Deploying swarm stack > Done")
 
     if ret == 0:

{sbcli_dev-3.9.4 → sbcli_dev-3.9.5}/simplyblock_core/controllers/device_controller.py

@@ -80,6 +80,19 @@ def device_set_read_only(device_id):
 
 
 def device_set_online(device_id):
+    db_controller = DBController()
+    dev = db_controller.get_storage_devices(device_id)
+    snode = db_controller.get_storage_node_by_id(dev.node_id)
+    logger.info("Make other nodes connect to the node devices")
+    snodes = db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id)
+    for node in snodes:
+        if node.get_id() == snode.get_id() or node.status != StorageNode.STATUS_ONLINE:
+            continue
+        node.remote_devices = storage_node_ops._connect_to_remote_devs(node)
+        if node.enable_ha_jm:
+            node.remote_jm_devices = storage_node_ops._connect_to_remote_jm_devs(node)
+        node.write_to_db()
+
     ret = device_set_state(device_id, NVMeDevice.STATUS_ONLINE)
     if ret:
         logger.info("Adding task to device data migration")

{sbcli_dev-3.9.4 → sbcli_dev-3.9.5}/simplyblock_core/scripts/__init__.py

@@ -30,10 +30,12 @@ def configure_docker(docker_ip):
     return __run_script(['bash', '-x', os.path.join(DIR_PATH, 'config_docker.sh'), docker_ip])
 
 
-def deploy_stack(cli_pass, dev_ip, image_name, graylog_password, cluster_id, log_del_interval, metrics_retention_period):
+def deploy_stack(cli_pass, dev_ip, image_name, graylog_password, cluster_id,
+                 log_del_interval, metrics_retention_period, log_level):
     pass_hash = hashlib.sha256(graylog_password.encode('utf-8')).hexdigest()
     return __run_script(
-        ['sudo', 'bash', '-x', os.path.join(DIR_PATH, 'deploy_stack.sh'), cli_pass, dev_ip, image_name, pass_hash, graylog_password, cluster_id, log_del_interval, metrics_retention_period])
+        ['sudo', 'bash', '-x', os.path.join(DIR_PATH, 'deploy_stack.sh'), cli_pass, dev_ip, image_name, pass_hash,
+         graylog_password, cluster_id, log_del_interval, metrics_retention_period, log_level])
 
 
 def deploy_cleaner():

{sbcli_dev-3.9.4 → sbcli_dev-3.9.5}/simplyblock_core/scripts/deploy_stack.sh

@@ -11,6 +11,7 @@ export CLUSTER_SECRET=$5
 export CLUSTER_ID=$6
 export LOG_DELETION_INTERVAL=$7
 export RETENTION_PERIOD=$8
+export LOG_LEVEL=$9
 export DIR="$(dirname "$(realpath "$0")")"
 
 if [ -s "/etc/foundationdb/fdb.cluster" ]

{sbcli_dev-3.9.4 → sbcli_dev-3.9.5}/simplyblock_core/scripts/docker-compose-swarm.yml

@@ -6,6 +6,7 @@ services:
     networks:
       - hostnet
     environment:
+      SIMPLYBLOCK_LOG_LEVEL: '$LOG_LEVEL'
       FDB_CLUSTER_FILE_CONTENTS: '$FDB_CLUSTER_FILE_CONTENTS'
       FDB_NETWORKING_MODE: 'container'
       FDB_CLUSTER_FILE: '/etc/foundationdb/fdb.cluster'
@@ -32,8 +33,9 @@ services:
     volumes:
       - "/etc/foundationdb:/etc/foundationdb"
     environment:
-      - FLASK_DEBUG=False
-      - FLASK_ENV=production
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
+      FLASK_DEBUG: "False"
+      FLASK_ENV: "production"
 
   StorageNodeMonitor:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -45,6 +47,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   MgmtNodeMonitor:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -56,6 +60,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   CachingNodeMonitor:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -67,6 +73,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   LVolStatsCollector:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -78,6 +86,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   CachedLVolStatsCollector:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -89,18 +99,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
-
-  PortStatsCollector:
-    image: $SIMPLYBLOCK_DOCKER_IMAGE
-    command: "python simplyblock_core/services/port_stat_collector.py"
-    networks:
-      - hostnet
-    deploy:
-      mode: global
-      placement:
-        constraints: [node.role == worker]
-    volumes:
-      - "/etc/foundationdb:/etc/foundationdb"
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   MainDistrEventCollector:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -112,6 +112,8 @@ services:
         constraints: [node.role == manager]
     volumes:
       - "/etc/foundationdb:/etc/foundationdb"
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   HAProxy:
     image: haproxytech/haproxy-debian:latest
@@ -127,6 +129,8 @@ services:
       - monitoring-net
     volumes:
       - "$DIR/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg"
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   CapacityAndStatsCollector:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -138,6 +142,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   CapacityMonitor:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -149,6 +155,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   HealthCheck:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -160,6 +168,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   DeviceMonitor:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -171,6 +181,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   LVolMonitor:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -182,10 +194,13 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   CleanupFDB:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
     environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
       LOG_DELETION_INTERVAL: "${LOG_DELETION_INTERVAL}"
     command: "python simplyblock_core/workers/cleanup_foundationdb.py"
     deploy:
@@ -206,6 +221,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   TasksRunnerMigration:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -217,6 +234,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   TasksRunnerFailedMigration:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -228,6 +247,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   TasksRunnerNewDeviceMigration:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -239,6 +260,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   NewDeviceDiscovery:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -250,6 +273,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
   TasksNodeAddRunner:
     image: $SIMPLYBLOCK_DOCKER_IMAGE
@@ -261,6 +286,8 @@ services:
       - "/etc/foundationdb:/etc/foundationdb"
     networks:
       - hostnet
+    environment:
+      SIMPLYBLOCK_LOG_LEVEL: "$LOG_LEVEL"
 
 
 volumes: