sbcli-dev 19.2.25__tar.gz → 19.2.27__tar.gz

sbcli_dev-19.2.27/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023-2025 simplyblock GmbH
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 19.2.25
+Version: 19.2.27
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
 Author-email: hamdy@simplyblock.io
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: foundationdb==7.3.63
 Requires-Dist: requests
 Requires-Dist: prettytable>=3.10.0
@@ -37,6 +38,7 @@ Dynamic: author-email
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/sbcli_dev.egg-info/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 19.2.25
+Version: 19.2.27
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
 Author-email: hamdy@simplyblock.io
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: foundationdb==7.3.63
 Requires-Dist: requests
 Requires-Dist: prettytable>=3.10.0
@@ -37,6 +38,7 @@ Dynamic: author-email
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/sbcli_dev.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+LICENSE
 README.md
 pyproject.toml
 requirements.txt
@@ -82,7 +83,6 @@ simplyblock_core/scripts/alerting/alert_resources.yaml.j2
 simplyblock_core/scripts/alerting/alert_rules.yaml
 simplyblock_core/scripts/charts/.helmignore
 simplyblock_core/scripts/charts/Chart.yaml
-simplyblock_core/scripts/charts/values-template.yaml
 simplyblock_core/scripts/charts/values.yaml
 simplyblock_core/scripts/charts/crds/apps.foundationdb.org_foundationdbbackups.yaml
 simplyblock_core/scripts/charts/crds/apps.foundationdb.org_foundationdbclusters.yaml
@@ -93,6 +93,8 @@ simplyblock_core/scripts/charts/templates/app_k8s.yaml
 simplyblock_core/scripts/charts/templates/app_sa.yaml
 simplyblock_core/scripts/charts/templates/app_svc.yaml
 simplyblock_core/scripts/charts/templates/clusterrole.yaml
+simplyblock_core/scripts/charts/templates/csi-hostpath-driverinfo.yaml
+simplyblock_core/scripts/charts/templates/csi-hostpath-plugin.yaml
 simplyblock_core/scripts/charts/templates/dashboards.yaml
 simplyblock_core/scripts/charts/templates/foundationdb.yaml
 simplyblock_core/scripts/charts/templates/mongodb.yaml
@@ -136,6 +138,7 @@ simplyblock_core/services/tasks_runner_new_dev_migration.py
 simplyblock_core/services/tasks_runner_node_add.py
 simplyblock_core/services/tasks_runner_port_allow.py
 simplyblock_core/services/tasks_runner_restart.py
+simplyblock_core/services/tasks_runner_sync_lvol_del.py
 simplyblock_core/test/test_models.py
 simplyblock_core/test/test_utils.py
 simplyblock_core/utils/__init__.py

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/simplyblock_core/cluster_ops.py

@@ -1194,6 +1194,18 @@ def update_cluster(cluster_id, mgmt_only=False, restart=False, spdk_image=None,
                 networks=["host"],
                 constraints=["node.role == manager"]
             )
+
+        if "app_TasksRunnerLVolSyncDelete" not in service_names:
+            logger.info("Creating lvol sync delete service")
+            cluster_docker.services.create(
+                image=service_image,
+                command="python simplyblock_core/services/tasks_runner_sync_lvol_del.py",
+                name="app_TasksRunnerLVolSyncDelete",
+                mounts=["/etc/foundationdb:/etc/foundationdb"],
+                env=["SIMPLYBLOCK_LOG_LEVEL=DEBUG"],
+                networks=["host"],
+                constraints=["node.role == manager"]
+            )
         logger.info("Done updating mgmt cluster")
 
     elif cluster.mode == "kubernetes":

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/simplyblock_core/constants.py

@@ -133,7 +133,8 @@ LVOL_NVME_CONNECT_CTRL_LOSS_TMO=60*60
 LVOL_NVME_CONNECT_NR_IO_QUEUES=3
 LVOL_NVME_KEEP_ALIVE_TO=10
 LVOL_NVME_KEEP_ALIVE_TO_TCP=7
-LVOL_NVMF_PORT_START=int(os.getenv('LVOL_NVMF_PORT_START', 9100))
+LVOL_NVMF_PORT_ENV = os.getenv("LVOL_NVMF_PORT_START", "")
+LVOL_NVMF_PORT_START = int(LVOL_NVMF_PORT_ENV) if LVOL_NVMF_PORT_ENV else 9100
 QPAIR_COUNT=32
 CLIENT_QPAIR_COUNT=3
 NVME_TIMEOUT_US=8000000
@@ -224,4 +225,4 @@ prometheus_patch = {
 
 qos_class_meta_and_migration_weight_percent = 25
 
-MIG_PARALLEL_JOBS = 16
+MIG_PARALLEL_JOBS = 64

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/simplyblock_core/controllers/health_controller.py

@@ -128,11 +128,11 @@ def _check_node_api(ip):
     return False
 
 
-def _check_spdk_process_up(ip, rpc_port):
+def _check_spdk_process_up(ip, rpc_port, cluster_id):
     try:
         snode_api = SNodeClient(f"{ip}:5000", timeout=10, retry=2)
         logger.debug(f"Node API={ip}:5000")
-        is_up, _ = snode_api.spdk_process_is_up(rpc_port)
+        is_up, _ = snode_api.spdk_process_is_up(rpc_port, cluster_id)
         logger.debug(f"SPDK is {is_up}")
         return is_up
     except Exception as e:

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/simplyblock_core/controllers/tasks_controller.py

@@ -70,6 +70,11 @@ def _add_task(function_name, cluster_id, node_id, device_id,
         if task_id:
             logger.info(f"Task found, skip adding new task: {task_id}")
             return False
+    elif function_name == JobSchedule.FN_LVOL_SYNC_DEL:
+        task_id = get_lvol_sync_del_task(cluster_id, node_id, function_params['lvol_bdev_name'])
+        if task_id:
+            logger.info(f"Task found, skip adding new task: {task_id}")
+            return False
 
     task_obj = JobSchedule()
     task_obj.uuid = str(uuid.uuid4())
@@ -386,3 +391,21 @@ def get_jc_comp_task(cluster_id, node_id, jm_vuid=0):
                 if jm_vuid and "jm_vuid" in task.function_params and task.function_params["jm_vuid"] == jm_vuid:
                     return task.uuid
     return False
+
+
+def add_lvol_sync_del_task(cluster_id, node_id, lvol_bdev_name):
+    return _add_task(JobSchedule.FN_LVOL_SYNC_DEL, cluster_id, node_id, "",
+                     function_params={"lvol_bdev_name": lvol_bdev_name}, max_retry=10)
+
+def get_lvol_sync_del_task(cluster_id, node_id, lvol_bdev_name=None):
+    tasks = db.get_job_tasks(cluster_id)
+    for task in tasks:
+        if task.function_name == JobSchedule.FN_LVOL_SYNC_DEL and task.node_id == node_id :
+            if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
+                if lvol_bdev_name:
+                    if "lvol_bdev_name" in task.function_params and task.function_params["lvol_bdev_name"] == lvol_bdev_name:
+                        return task.uuid
+                else:
+                    return task.uuid
+    return False
+

sbcli_dev-19.2.27/simplyblock_core/env_var

@@ -0,0 +1,6 @@
+SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
+SIMPLY_BLOCK_VERSION=19.2.27
+
+SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main-33ee3e42
+SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=simplyblock/spdk:R25.6-Hotfix-4e149581
+

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/simplyblock_core/models/job_schedule.py

@@ -22,6 +22,7 @@ class JobSchedule(BaseModel):
     FN_BALANCING_AFTER_DEV_REMOVE = "balancing_on_dev_rem"
     FN_BALANCING_AFTER_DEV_EXPANSION = "balancing_on_dev_add"
     FN_JC_COMP_RESUME = "jc_comp_resume"
+    FN_LVOL_SYNC_DEL = "lvol_sync_del"
 
     canceled: bool = False
     cluster_id: str = ""

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/simplyblock_core/models/storage_node.py

@@ -102,7 +102,6 @@ class StorageNode(BaseNodeObject):
     hublvol: HubLVol = None  # type: ignore[assignment]
     active_tcp: bool = True
     active_rdma: bool = False
-    lvol_sync_del_queue: List[str] = []
 
     def rpc_client(self, **kwargs):
         """Return rpc client to this node

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/simplyblock_core/rpc_client.py

@@ -922,7 +922,7 @@ class RPCClient:
         params = {"name": name}
         return self._request("distr_migration_status", params)
 
-    def distr_migration_failure_start(self, name, storage_ID, qos_high_priority=False, job_size=1024, jobs=4):
+    def distr_migration_failure_start(self, name, storage_ID, qos_high_priority=False, job_size=64, jobs=64):
         params = {
             "name": name,
             "storage_ID": storage_ID,
@@ -935,7 +935,7 @@ class RPCClient:
             params["jobs"] = jobs
         return self._request("distr_migration_failure_start", params)
 
-    def distr_migration_expansion_start(self, name, qos_high_priority=False, job_size=1024, jobs=4):
+    def distr_migration_expansion_start(self, name, qos_high_priority=False, job_size=64, jobs=64):
         params = {
             "name": name,
         }

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/simplyblock_core/scripts/charts/Chart.yaml

@@ -26,11 +26,6 @@ dependencies:
     version: "25.18.0"
     repository: "https://prometheus-community.github.io/helm-charts"
     condition: monitoring.enabled
-  - name: openebs
-    version: 3.9.0 
-    repository: https://openebs.github.io/charts
-    alias: openebs
-    condition: openebs.enabled
   - name: ingress-nginx
     version: 4.10.1
     repository: "https://kubernetes.github.io/ingress-nginx"

{sbcli_dev-19.2.25 → sbcli_dev-19.2.27}/simplyblock_core/scripts/charts/templates/app_k8s.yaml

@@ -19,6 +19,8 @@ spec:
         app: simplyblock-admin-control
     spec:
       serviceAccountName: simplyblock-control-sa
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet 
       containers:
       - name: simplyblock-control
         image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -133,6 +135,8 @@ spec:
       labels:
         app: simplyblock-storage-node-monitor
     spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet 
       containers:
       - name: storage-node-monitor
         image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -183,6 +187,8 @@ spec:
       labels:
         app: simplyblock-mgmt-node-monitor
     spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet 
       containers:
         - name: mgmt-node-monitor
           image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -235,6 +241,8 @@ spec:
       labels:
         app: simplyblock-lvol-stats-collector
     spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet 
       containers:
         - name: lvol-stats-collector
           image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -284,7 +292,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-main-distr-event-collector
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
         - name: main-distr-event-collector
           image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -334,7 +344,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-capacity-and-stats-collector
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
       - name: capacity-and-stats-collector
         image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -385,7 +397,8 @@ spec:
       labels:
         app: simplyblock-capacity-monitor
     spec:
-      
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
       - name: capacity-monitor
         image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -435,7 +448,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-health-check
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
       - name: health-check
         image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -485,7 +500,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-device-monitor
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
       - name: device-monitor
         image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -535,7 +552,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-lvol-monitor
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
       - name: lvol-monitor
         image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -584,7 +603,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-snapshot-monitor
-    spec:     
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet      
       containers:
       - name: snapshot-monitor
         image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -685,7 +706,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-tasks-runner-restart
-    spec:     
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet      
       containers:
         - name: tasks-runner-restart
           image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -735,7 +758,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-tasks-runner-migration
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
         - name: tasks-runner-migration
           image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -784,7 +809,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-tasks-runner-failed-migration
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
         - name: tasks-runner-failed-migration
           image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -833,7 +860,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-tasks-runner-cluster-status
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
         - name: tasks-runner-cluster-status
           image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -882,7 +911,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-tasks-runner-new-device-migration
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
         - name: tasks-runner-new-device-migration
           image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -931,7 +962,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-tasks-node-add-runner
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
         - name: tasks-node-addrunner
           image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -983,7 +1016,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-tasks-runner-port-allow
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
         - name: tasks-runner-port-allow
           image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"
@@ -1032,7 +1067,9 @@ spec:
         reloader.stakater.com/configmap: "simplyblock-fdb-cluster-config"
       labels:
         app: simplyblock-tasks-runner-jc-comp-resume
-    spec:      
+    spec:
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet       
       containers:
         - name: tasks-runner-jc-comp-resume
           image: "{{ .Values.image.simplyblock.repository }}:{{ .Values.image.simplyblock.tag }}"

sbcli_dev-19.2.27/simplyblock_core/scripts/charts/templates/csi-hostpath-driverinfo.yaml

@@ -0,0 +1,24 @@
+apiVersion: storage.k8s.io/v1
+kind: CSIDriver
+metadata:
+  name: hostpath.csi.k8s.io
+  labels:
+    app.kubernetes.io/instance: hostpath.csi.k8s.io
+    app.kubernetes.io/part-of: csi-driver-host-path
+    app.kubernetes.io/name: hostpath.csi.k8s.io
+    app.kubernetes.io/component: csi-driver
+spec:
+  # Supports persistent and ephemeral inline volumes.
+  volumeLifecycleModes:
+  - Persistent
+  - Ephemeral
+  # To determine at runtime which mode a volume uses, pod info and its
+  # "csi.storage.k8s.io/ephemeral" entry are needed.
+  podInfoOnMount: true
+  # No attacher needed.
+  attachRequired: false
+  storageCapacity: false
+  # Kubernetes may use fsGroup to change permissions and ownership 
+  # of the volume to match user requested fsGroup in the pod's SecurityPolicy
+  fsGroupPolicy: File
+