sbcli-pre 25.5.5__tar.gz → 25.5.7__tar.gz

{sbcli-pre-25.5.5 → sbcli-pre-25.5.7}/PKG-INFO

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

{sbcli-pre-25.5.5 → sbcli-pre-25.5.7}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli-pre-25.5.5 → sbcli-pre-25.5.7}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=25.5.5
+SIMPLY_BLOCK_VERSION=25.5.7
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:R25.5-PRE

{sbcli-pre-25.5.5 → sbcli-pre-25.5.7}/simplyblock_core/rpc_client.py

@@ -140,7 +140,7 @@ class RPCClient:
         params = {
             "trtype": trtype,
             "max_io_qpairs_per_ctrlr": 128,
-            "max_queue_depth": 64,
+            "max_queue_depth": 256,
             "abort_timeout_sec": 5,
             "ack_timeout": 2048,
             "zcopy": True,

{sbcli-pre-25.5.5 → sbcli-pre-25.5.7}/simplyblock_core/services/tasks_cluster_status.py

@@ -10,7 +10,7 @@ cluster_commands = [
     "sbcli-dev cluster show",
     "sbcli-dev cluster get-capacity",
     "sbcli-dev cluster get-io-stats",
-    "sbcli-dev cluster get-logs",
+    "sbcli-dev cluster get-logs --limit 0",
     "sbcli-dev lvol list --cluster-id",
 ]
 

{sbcli-pre-25.5.5 → sbcli-pre-25.5.7}/simplyblock_core/storage_node_ops.py

@@ -2988,13 +2988,15 @@ def recreate_lvstore(snode):
             sec_node_api.firewall_set_port(snode.lvol_subsys_port, "tcp", "block", sec_node.rpc_port)
             tcp_ports_events.port_deny(sec_node, snode.lvol_subsys_port)
 
-            # time.sleep(1)
+            # time.sleep(0.2)
             ### 4- set leadership to false
             sec_rpc_client.bdev_lvol_set_leader(snode.lvstore, leader=False, bs_nonleadership=True)
             sec_rpc_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
             time.sleep(1)
 
     ### 5- examine
+    time.sleep(0.2)
+    rpc_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
     ret = rpc_client.bdev_examine(snode.raid)
     # time.sleep(1)
 
@@ -3126,7 +3128,7 @@ def get_sorted_ha_jms(current_node):
             if jm_dev_to_mgmt_ip[jm_id] == current_node.mgmt_ip:
                 continue
             mgmt_ips.append(jm_dev_to_mgmt_ip[jm_id])
-            out.append(jm_count)
+            out.append(jm_id)
     return out[:constants.HA_JM_COUNT-1]
 
 

{sbcli-pre-25.5.5 → sbcli-pre-25.5.7}/simplyblock_web/blueprints/snode_ops_k8s.py

@@ -360,12 +360,12 @@ def spdk_process_start(body: SPDKParams):
         }
         dep = yaml.safe_load(template.render(values))
         logger.debug(dep)
-        k8s_apps_v1 = core_utils.get_k8s_apps_client()
-        resp = k8s_apps_v1.create_namespaced_deployment(body=dep, namespace=namespace)
-        msg = f"Deployment created: '{resp.metadata.name}' in namespace '{namespace}"
+        k8s_core_v1 = core_utils.get_k8s_core_client()
+        resp = k8s_core_v1.create_namespaced_pod(body=dep, namespace=namespace)
+        msg = f"Pod created: '{resp.metadata.name}' in namespace '{namespace}"
         logger.info(msg)
     except:
-        return utils.get_response(False, f"Deployment failed:\n{traceback.format_exc()}")
+        return utils.get_response(False, f"Pod failed:\n{traceback.format_exc()}")
 
     return utils.get_response(msg)
 
@@ -376,11 +376,10 @@ def spdk_process_start(body: SPDKParams):
     })}}},
 })
 def spdk_process_kill():
-    k8s_apps_v1 = core_utils.get_k8s_apps_client()
     k8s_core_v1 = core_utils.get_k8s_core_client()
     try:
         namespace = node_utils_k8s.get_namespace()
-        resp = k8s_apps_v1.delete_namespaced_deployment(deployment_name, namespace)
+        resp = k8s_core_v1.delete_namespaced_pod(deployment_name, namespace)
         retries = 10
         while retries > 0:
             resp = k8s_core_v1.list_namespaced_pod(namespace)

sbcli-pre-25.5.7/simplyblock_web/templates/storage_deploy_spdk.yaml.j2

@@ -0,0 +1,198 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: snode-spdk-deployment-{{ HOSTNAME }}
+  namespace: {{ NAMESPACE }}
+  labels:
+    app: spdk-app-{{ HOSTNAME }}
+spec:
+  restartPolicy: Never
+  serviceAccountName: simplyblock-storage-node-sa
+  nodeSelector:
+    kubernetes.io/hostname: {{ HOSTNAME }}
+  hostNetwork: true
+  tolerations:
+    - effect: NoSchedule
+      operator: Exists
+    - effect: NoExecute
+      operator: Exists
+  volumes:
+    - name: socket-dir
+      emptyDir:
+        medium: "Memory"
+    - name: host-sys
+      hostPath:
+        path: /sys
+    - name: host-proc
+      hostPath:
+        path: /proc
+    - name: host-rootfs
+      hostPath:
+        path: /
+    - name: foundationdb
+      hostPath:
+        path: /var/foundationdb
+    - name: etc-simplyblock
+      hostPath:
+        path: /var/simplyblock
+    - name: host-modules
+      hostPath:
+        path: /lib/modules
+    - name: dev-vol
+      hostPath:
+        path: /dev
+    - name: hugepage
+      emptyDir:
+        medium: HugePages
+    - name: script-volume
+      emptyDir: {}
+    - name: varlog
+      hostPath:
+        path: /var/log
+    - name: dockercontainerlogdirectory
+      hostPath:
+        path: /var/log/pods
+
+  initContainers:
+    - name: copy-script
+      image: public.ecr.aws/simply-block/busybox
+      command: ["sh", "-c", "echo \"{{ FDB_CONNECTION }}\" > /etc/foundationdb/fdb.cluster"]
+      volumeMounts:
+        - name: foundationdb
+          mountPath: /etc/foundationdb
+
+    - name: apply-config-to-node
+      image: alpine:3.19
+      command:
+        - /bin/sh
+        - -c
+        - |
+          set -e
+          echo "Installing tools..."
+          apk add --no-cache iproute2 curl grep
+
+          NODE_IP=$(ip route get 1.1.1.1 | grep -oE 'src [0-9.]+' | awk '{print $2}')
+          echo "Detected node IP: ${NODE_IP}"
+
+          echo "Sending config to ${NODE_IP}..."
+          RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -X POST http://${NODE_IP}:5000/snode/apply_config \
+            -H "Content-Type: application/json" \
+            -d '{}')
+
+          echo "Response code: ${RESPONSE}"
+          if [ "$RESPONSE" -lt 200 ] || [ "$RESPONSE" -ge 300 ]; then
+            echo "Failed to send config to ${NODE_IP}, exiting."
+            exit 1
+          fi
+
+  containers:
+    - name: spdk-container
+      image: {{ SPDK_IMAGE }}
+      imagePullPolicy: "Always"
+      command:
+        - sh
+        - -c
+        - |
+          if [ ! -e /dev/fd ]; then
+            ln -s /proc/self/fd /dev/fd
+          fi
+          /root/scripts/run_distr_with_ssd.sh "{{ L_CORES }}" "{{ SPDK_MEM }}"
+      env:
+        - name: SSD_PCIE
+          value: "{{ SSD_PCIE }}"
+        - name: PCI_ALLOWED
+          value: "{{ PCI_ALLOWED }}"
+        - name: TOTAL_HP
+          value: "{{ TOTAL_HP }}"
+        - name: RPC_PORT
+          value: "{{ RPC_PORT }}"
+        - name: SPDKCSI_SECRET
+          valueFrom:
+            secretKeyRef:
+              name: simplyblock-csi-secret
+              key: secret.json
+        - name: CLUSTER_CONFIG
+          valueFrom:
+            configMapKeyRef:
+              name: simplyblock-csi-cm
+              key: config.json
+      lifecycle:
+        postStart:
+          exec:
+            command: ["/bin/sh", "-c", "sudo modprobe nbd || echo failed to modprobe nbd"]
+      securityContext:
+        privileged: true
+      volumeMounts:
+        - name: socket-dir
+          mountPath: /var/tmp
+        - name: host-sys
+          mountPath: /sys
+        - name: host-modules
+          mountPath: /lib/modules
+        - name: dev-vol
+          mountPath: /dev
+        - name: script-volume
+          mountPath: /script
+        - name: etc-simplyblock
+          mountPath: /etc/simplyblock
+      resources:
+        limits:
+          hugepages-2Mi: {{ MEM_GEGA }}Gi
+          memory: {{ MEM2_GEGA }}Gi
+        requests:
+          hugepages-2Mi: {{ MEM_GEGA }}Gi
+
+    - name: spdk-proxy-container
+      image: {{ SIMPLYBLOCK_DOCKER_IMAGE }}
+      imagePullPolicy: "Always"
+      command: ["python", "simplyblock_core/services/spdk_http_proxy_server.py"]
+      volumeMounts:
+        - name: socket-dir
+          mountPath: /var/tmp
+      env:
+        - name: SERVER_IP
+          value: "{{ SERVER_IP }}"
+        - name: RPC_PORT
+          value: "{{ RPC_PORT }}"
+        - name: RPC_USERNAME
+          value: "{{ RPC_USERNAME }}"
+        - name: RPC_PASSWORD
+          value: "{{ RPC_PASSWORD }}"
+        - name: MULTI_THREADING_ENABLED
+          value: "True"
+        - name: TIMEOUT
+          value: "300"
+
+    - name: fluentd
+      image: public.ecr.aws/simply-block/fluentd-kubernetes-daemonset:v1.17.1-debian-graylog-1.2
+      imagePullPolicy: "Always"
+      env:
+        - name: K8S_NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
+        - name: FLUENT_GRAYLOG_HOST
+          value: "{{ GRAYLOG_SERVER_IP }}"
+        - name: FLUENT_GRAYLOG_PORT
+          value: "12202"
+        - name: FLUENT_GRAYLOG_PROTOCOL
+          value: "tcp"
+        - name: FLUENTD_SYSTEMD_CONF
+          value: "disable"
+        - name: FLUENT_CONTAINER_TAIL_EXCLUDE_PATH
+          value: /var/log/pods/fluent*
+        - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
+          value: /^(?<time>.+) (?<stream>stdout|stderr)( (?<logtag>.))? (?<log>.*)$/
+      resources:
+        requests:
+          cpu: 200m
+          memory: 0.5Gi
+        limits:
+          cpu: 1000m
+          memory: 1Gi
+      volumeMounts:
+        - name: varlog
+          mountPath: /var/log
+        - name: dockercontainerlogdirectory
+          mountPath: /var/log/pods
+          readOnly: true

sbcli-pre-25.5.5/simplyblock_web/templates/storage_deploy_spdk.yaml.j2

@@ -1,205 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: snode-spdk-deployment-{{ HOSTNAME }}
-  namespace: {{ NAMESPACE }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: spdk-app-{{ HOSTNAME }}
-  template:
-    metadata:
-      labels:
-        app: spdk-app-{{ HOSTNAME }}
-    spec:
-      serviceAccountName: simplyblock-storage-node-sa
-      nodeSelector:
-        kubernetes.io/hostname: {{ HOSTNAME }}
-      hostNetwork: true
-      volumes:
-        - name: socket-dir
-          emptyDir:
-            medium: "Memory"
-        - name: host-sys
-          hostPath:
-            path: /sys
-        - name: host-proc
-          hostPath:
-            path: /proc
-        - name: host-rootfs
-          hostPath:
-            path: /
-        - name: foundationdb
-          hostPath:
-            path: /var/foundationdb
-        - name: etc-simplyblock
-          hostPath:
-            path: /var/simplyblock
-        - name: host-modules
-          hostPath:
-            path: /lib/modules
-        - name: dev-vol
-          hostPath:
-            path: /dev
-        - name: hugepage
-          emptyDir:
-            medium: HugePages
-        - name: script-volume
-          emptyDir: {}
-        - name: varlog
-          hostPath:
-            path: /var/log
-        - name: dockercontainerlogdirectory
-          hostPath:
-            path: /var/log/pods
-      tolerations:
-        - effect: NoSchedule
-          key: dedicated
-          operator: Equal
-          value: simplyblock-storage-plane
-
-      initContainers:
-        - name: copy-script
-          image: public.ecr.aws/simply-block/busybox
-          command: ["sh", "-c", "echo \"{{ FDB_CONNECTION }}\" > /etc/foundationdb/fdb.cluster"]
-          volumeMounts:
-            - name: foundationdb
-              mountPath: /etc/foundationdb
-
-        - name: apply-config-to-node
-          image: alpine:3.19
-          command:
-            - /bin/sh
-            - -c
-            - |
-              set -e
-              echo "Installing tools..."
-              apk add --no-cache iproute2 curl grep
-
-              NODE_IP=$(ip route get 1.1.1.1 | grep -oE 'src [0-9.]+' | awk '{print $2}')
-              echo "Detected node IP: ${NODE_IP}"
-
-              echo "Sending config to ${NODE_IP}..."
-              RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" -X POST http://${NODE_IP}:5000/snode/apply_config \
-                -H "Content-Type: application/json" \
-                -d '{}')
-
-              echo "Response code: ${RESPONSE}"
-              if [ "$RESPONSE" -lt 200 ] || [ "$RESPONSE" -ge 300 ]; then
-                echo "Failed to send config to ${NODE_IP}, exiting."
-                exit 1
-              fi
-
-      containers:
-
-      - name: spdk-container
-        image: {{ SPDK_IMAGE }}
-        imagePullPolicy: "Always"
-        command:
-          - sh
-          - -c
-          - |
-            if [ ! -e /dev/fd ]; then
-              ln -s /proc/self/fd /dev/fd
-            fi
-            /root/scripts/run_distr_with_ssd.sh "{{ L_CORES }}" "{{ SPDK_MEM }}"
-        env:
-          - name: SSD_PCIE
-            value: "{{ SSD_PCIE }}"
-          - name: PCI_ALLOWED
-            value: "{{ PCI_ALLOWED }}"
-          - name: TOTAL_HP
-            value: "{{ TOTAL_HP }}"
-          - name: RPC_PORT
-            value: "{{ RPC_PORT }}"
-          - name: SPDKCSI_SECRET
-            valueFrom:
-              secretKeyRef:
-                name: simplyblock-csi-secret
-                key: secret.json
-          - name: CLUSTER_CONFIG
-            valueFrom:
-              configMapKeyRef:
-                name: simplyblock-csi-cm
-                key: config.json
-        lifecycle:
-          postStart:
-            exec:
-              command: ["/bin/sh", "-c", "sudo modprobe nbd || echo failed to modprobe nbd"]
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - name: socket-dir
-          mountPath: /var/tmp
-        - name: host-sys
-          mountPath: /sys
-        - name: host-modules
-          mountPath: /lib/modules
-        - name: dev-vol
-          mountPath: /dev
-        - name: script-volume
-          mountPath: /script
-        - name: etc-simplyblock
-          mountPath: /etc/simplyblock
-        resources:
-          limits:
-            hugepages-2Mi: {{ MEM_GEGA }}Gi
-            memory: {{ MEM2_GEGA }}Gi
-          requests:
-            hugepages-2Mi: {{ MEM_GEGA }}Gi
-
-      - name: spdk-proxy-container
-        image: {{ SIMPLYBLOCK_DOCKER_IMAGE }}
-        imagePullPolicy: "Always"
-        command: ["python", "simplyblock_core/services/spdk_http_proxy_server.py"]
-        volumeMounts:
-        - name: socket-dir
-          mountPath: /var/tmp
-        env:
-        - name: SERVER_IP
-          value: "{{ SERVER_IP }}"
-        - name: RPC_PORT
-          value: "{{ RPC_PORT }}"
-        - name: RPC_USERNAME
-          value: "{{ RPC_USERNAME }}"
-        - name: RPC_PASSWORD
-          value: "{{ RPC_PASSWORD }}"
-        - name: MULTI_THREADING_ENABLED
-          value: "True"
-        - name: TIMEOUT
-          value: "300"
-      - name: fluentd
-        image: public.ecr.aws/simply-block/fluentd-kubernetes-daemonset:v1.17.1-debian-graylog-1.2
-        imagePullPolicy: "Always"
-        env:
-        - name: K8S_NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
-        - name:  FLUENT_GRAYLOG_HOST
-          value: "{{ GRAYLOG_SERVER_IP }}"
-        - name:  FLUENT_GRAYLOG_PORT
-          value: "12202"
-        - name:  FLUENT_GRAYLOG_PROTOCOL
-          value: "tcp"
-        - name:  FLUENTD_SYSTEMD_CONF
-          value: "disable"
-        - name: FLUENT_CONTAINER_TAIL_EXCLUDE_PATH
-          value: /var/log/pods/fluent*
-        - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
-          value: /^(?<time>.+) (?<stream>stdout|stderr)( (?<logtag>.))? (?<log>.*)$/
-        resources:
-          requests:
-            cpu: 200m
-            memory: 0.5Gi
-          limits:
-            cpu: 1000m
-            memory: 1Gi
-        volumeMounts:
-        - name: varlog
-          mountPath: /var/log
-        - name: dockercontainerlogdirectory
-          mountPath: /var/log/pods
-          readOnly: true
-