Adjust parameters

reanahub · Sep 25, 2024 · c927f28 · c927f28
1 parent 60c5688
commit c927f28
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 30 deletions.
diff --git a/helm/reana/README.md b/helm/reana/README.md
@@ -60,13 +60,11 @@ This Helm automatically prefixes all names using the release name to avoid colli
 | `components.reana_workflow_engine_snakemake.environment` | [REANA-Workflow-Engine-Snakemake](https://github.com/reanahub/reana-workflow-engine-snakemake) environment variables | `{}`            |
 | `components.reana_workflow_engine_snakemake.image`       | [REANA-Workflow-Engine-Snakemake image](https://hub.docker.com/r/reanahub/reana-workflow-engine-snakemake) to use | `docker.io/reanahub/reana-workflow-engine-snakemake:<chart-release-version>` |
 | `compute_backends`                                       | List of supported compute backends (kubernetes, htcondorcern, slurmcern)             | "kubernetes"                                    |
-| `dask.enabled` | Install dask-kubernetes-operator custom resources in the cluster to enable dask workflows | true |
-| `dask.cluster_default_cores_limit` | Default cores limit for dask clusters | 4 |
-| `dask.cluster_max_cores_limit` | Max cores limit for dask clusters | 16 | 
-| `dask.cluster_default_memory_limit` | Default memory limit for dask clusters | "2Gi" |
-| `dask.cluster_max_memory_limit` | Max memory limit for dask clusters | "4Gi" | 
-| `dask.cluster_default_single_worker_cores` | Amount of cores used by a single dask worker by default | 0.5 |
-| `dask.cluster_default_single_worker_memory` | Amount of memory used by a single dask worker by default | "512Mi" | 
+| `dask.enabled` | Install dask-kubernetes-operator custom resources in the cluster to support Dask workflows | false |
+| `dask.cluster_max_memory_limit` | Max memory limit for Dask clusters | "16Gi" | 
+| `dask.cluster_default_number_of_workers` | Number of workers in Dask clusters by default | 2 | 
+| `dask.cluster_default_single_worker_memory` | Amount of memory used by a single Dask worker by default | "2Gi" |
+| `dask.cluster_max_single_worker_memory` | Maximum amount of memory that can be used by a single Dask worker | "8Gi" |
 | `db_env_config.REANA_DB_HOST`                            | Environment variable to connect to external databases                                | `<chart-release-name>-db`                       |
 | `db_env_config.REANA_DB_NAME`                            | Environment variable to connect to external databases                                | reana                                           |
 | `db_env_config.REANA_DB_PORT`                            | Environment variable to connect to external databases                                | "5432"                                          |

diff --git a/helm/reana/templates/reana-server.yaml b/helm/reana/templates/reana-server.yaml
@@ -101,18 +101,14 @@ spec:
           - name: DASK_ENABLED
             value: {{ .Values.dask.enabled | quote }}
           {{- if .Values.dask.enabled }}
-          - name: REANA_DASK_CLUSTER_MAX_CORES_LIMIT
-            value: !!str {{ .Values.dask.cluster_max_cores_limit | default 8 }}
           - name: REANA_DASK_CLUSTER_MAX_MEMORY_LIMIT
-            value: {{ .Values.dask.cluster_max_memory_limit | default "4Gi" }}
-          - name: REANA_DASK_CLUSTER_DEFAULT_CORES_LIMIT
-            value: !!str {{ .Values.dask.cluster_default_cores_limit | default 4 }}
-          - name: REANA_DASK_CLUSTER_DEFAULT_MEMORY_LIMIT
-            value: {{ .Values.dask.cluster_default_memory_limit | default "2Gi" }}
-          - name: REANA_DASK_CLUSTER_DEFAULT_SINGLE_WORKER_CORES
-            value: !!str {{ .Values.dask.cluster_default_single_worker_cores | default 0.5 }}
+            value: {{ .Values.dask.cluster_max_memory_limit | default "16Gi" }}
+          - name: REANA_DASK_CLUSTER_DEFAULT_NUMBER_OF_WORKERS
+            value: !!str {{ .Values.dask.cluster_default_number_of_workers | default 2 }}
           - name: REANA_DASK_CLUSTER_DEFAULT_SINGLE_WORKER_MEMORY
-            value: {{ .Values.dask.cluster_default_single_worker_memory | default "512Mi" }}
+            value: {{ .Values.dask.cluster_default_single_worker_memory | default "2Gi" }}
+          - name: REANA_DASK_CLUSTER_MAX_SINGLE_WORKER_MEMORY
+            value: {{ .Values.dask.cluster_max_single_worker_memory | default "8Gi" }}
           {{- end }}          
           - name: WORKSPACE_PATHS
             value: {{ .Values.workspaces.paths | toJson | quote }}

diff --git a/helm/reana/templates/reana-workflow-controller.yaml b/helm/reana/templates/reana-workflow-controller.yaml
@@ -174,14 +174,14 @@ spec:
           - name: DASK_ENABLED
             value: {{ .Values.dask.enabled | quote }}
           {{- if .Values.dask.enabled }}
-          - name: REANA_DASK_CLUSTER_DEFAULT_CORES_LIMIT
-            value: !!str {{ .Values.dask.cluster_default_cores_limit | default 4 }}
-          - name: REANA_DASK_CLUSTER_DEFAULT_MEMORY_LIMIT
-            value: {{ .Values.dask.cluster_default_memory_limit | default "2Gi" }}
-          - name: REANA_DASK_CLUSTER_DEFAULT_SINGLE_WORKER_CORES
-            value: !!str {{ .Values.dask.cluster_default_single_worker_cores | default 0.5 }}
+          - name: REANA_DASK_CLUSTER_MAX_MEMORY_LIMIT
+            value: {{ .Values.dask.cluster_max_memory_limit | default "16Gi" }}
+          - name: REANA_DASK_CLUSTER_DEFAULT_NUMBER_OF_WORKERS
+            value: !!str {{ .Values.dask.cluster_default_number_of_workers | default 2 }}
           - name: REANA_DASK_CLUSTER_DEFAULT_SINGLE_WORKER_MEMORY
-            value: {{ .Values.dask.cluster_default_single_worker_memory | default "512Mi" }}
+            value: {{ .Values.dask.cluster_default_single_worker_memory | default "2Gi" }}
+          - name: REANA_DASK_CLUSTER_MAX_SINGLE_WORKER_MEMORY
+            value: {{ .Values.dask.cluster_max_single_worker_memory | default "8Gi" }}
           {{- end }}        
           {{- if .Values.reana_hostname }}
           - name: REANA_HOSTNAME

diff --git a/helm/reana/values.yaml b/helm/reana/values.yaml
@@ -175,12 +175,10 @@ traefik:
 
 dask:
   enabled: true
-  cluster_default_cores_limit: 4
-  cluster_max_cores_limit: 8
-  cluster_default_memory_limit: "2Gi"
-  cluster_max_memory_limit: "4Gi"
-  cluster_default_single_worker_cores: 0.5
-  cluster_default_single_worker_memory: "256Mi"
+  cluster_max_memory_limit: "16Gi"
+  cluster_default_number_of_workers: 2
+  cluster_default_single_worker_memory: "2Gi"
+  cluster_max_single_worker_memory: "4Gi"
 
 pgbouncer:
   enabled: false