Unified the tasks timeout for k8s deployments.

madgik · Sep 29, 2022 · ecc34e2 · ecc34e2
1 parent 0bc1862
commit ecc34e2
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 12 deletions.
diff --git a/kubernetes/templates/mipengine-controller.yaml b/kubernetes/templates/mipengine-controller.yaml
@@ -44,8 +44,6 @@ spec:
           value: "86400"  # One day in seconds
         - name: CELERY_TASKS_TIMEOUT
           value: {{ quote .Values.controller.celery_tasks_timeout }}
-        - name: CELERY_RUN_UDF_TASK_TIMEOUT
-          value: {{ quote .Values.controller.celery_run_udf_task_timeout }}
         - name: LOCALNODES_DNS
           value: "mipengine-nodes-service"
         - name: LOCALNODES_PORT

diff --git a/kubernetes/templates/mipengine-globalnode.yaml b/kubernetes/templates/mipengine-globalnode.yaml
@@ -67,8 +67,6 @@ spec:
           value: {{ .Values.framework_log_level }}
         - name: CELERY_TASKS_TIMEOUT
           value: {{ quote .Values.controller.celery_tasks_timeout }}
-        - name: CELERY_RUN_UDF_TASK_TIMEOUT
-          value: {{ quote .Values.controller.celery_run_udf_task_timeout }}
         - name: RABBITMQ_IP
           valueFrom:
             fieldRef:

diff --git a/kubernetes/templates/mipengine-localnode.yaml b/kubernetes/templates/mipengine-localnode.yaml
@@ -93,8 +93,6 @@ spec:
           value: {{ .Values.framework_log_level }}
         - name: CELERY_TASKS_TIMEOUT
           value: {{ quote .Values.controller.celery_tasks_timeout }}
-        - name: CELERY_RUN_UDF_TASK_TIMEOUT
-          value: {{ quote .Values.controller.celery_run_udf_task_timeout }}
         - name: RABBITMQ_IP
           valueFrom:
             fieldRef:

diff --git a/kubernetes/values.yaml b/kubernetes/values.yaml
@@ -14,8 +14,7 @@ csvs_datapath: /opt/mipengine/csvs
 
 controller:
   node_landscape_aggregator_update_interval: 30
-  celery_tasks_timeout: 20
-  celery_run_udf_task_timeout: 120
+  celery_tasks_timeout: 120
   nodes_cleanup_interval: 60
   cleanup_file_folder: /opt/cleanup
 

diff --git a/mipengine/controller/config.toml b/mipengine/controller/config.toml
@@ -20,7 +20,8 @@ user = "user"
 password = "password"
 vhost = "user_vhost"
 celery_tasks_timeout="$CELERY_TASKS_TIMEOUT"
-celery_run_udf_task_timeout="$CELERY_RUN_UDF_TASK_TIMEOUT"
+celery_cleanup_task_timeout="$CELERY_TASKS_TIMEOUT"
+celery_run_udf_task_timeout="$CELERY_TASKS_TIMEOUT"
 celery_tasks_max_retries=3
 celery_tasks_interval_start=0
 celery_tasks_interval_step=0.2

diff --git a/mipengine/node/config.toml b/mipengine/node/config.toml
@@ -10,7 +10,7 @@ minimum_row_count = 10
 [celery]
 worker_concurrency = 16
 tasks_timeout="$CELERY_TASKS_TIMEOUT"
-run_udf_task_timeout="$CELERY_RUN_UDF_TASK_TIMEOUT"
+run_udf_task_timeout="$CELERY_TASKS_TIMEOUT"
 
 [rabbitmq]
 ip = "$RABBITMQ_IP"

diff --git a/tests/prod_env_tests/deployment_configs/kubernetes_values.yaml b/tests/prod_env_tests/deployment_configs/kubernetes_values.yaml
@@ -14,8 +14,7 @@ csvs_datapath: /opt/mipengine/csvs
 
 controller:
   node_landscape_aggregator_update_interval: 20
-  celery_tasks_timeout: 10
-  celery_run_udf_task_timeout: 120
+  celery_tasks_timeout: 120
   nodes_cleanup_interval: 60
   cleanup_file_folder: /opt/cleanup