From e7f27fa89851707a257cac83e661e6e0d470c7ad Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Tue, 11 Jan 2022 11:43:43 -0600 Subject: [PATCH 1/2] add queue TTL value that gets passed to forwarder and websocket as env vars --- funcx/templates/forwarder-deployment.yaml | 2 ++ funcx/templates/websocket-service-deployment.yaml | 2 ++ funcx/values.yaml | 1 + 3 files changed, 5 insertions(+) diff --git a/funcx/templates/forwarder-deployment.yaml b/funcx/templates/forwarder-deployment.yaml index 3af18ff..a825ebc 100644 --- a/funcx/templates/forwarder-deployment.yaml +++ b/funcx/templates/forwarder-deployment.yaml @@ -39,6 +39,8 @@ spec: {{- else }} value: "{{ .Values.services.rabbitmq.externalURI }}" {{- end }} + - name: RABBITMQ_QUEUE_TTL + value: "{{ .Values.services.rabbitmq.queueTTL }}" {{- if not .Values.forwarder.useAWSMetadataServer }} - name: ADVERTISED_FORWARDER_ADDRESS valueFrom: diff --git a/funcx/templates/websocket-service-deployment.yaml b/funcx/templates/websocket-service-deployment.yaml index 40b9e7c..8d80cb8 100644 --- a/funcx/templates/websocket-service-deployment.yaml +++ b/funcx/templates/websocket-service-deployment.yaml @@ -40,6 +40,8 @@ spec: {{- else }} value: "{{ .Values.services.rabbitmq.externalURI }}" {{- end }} + - name: RABBITMQ_QUEUE_TTL + value: "{{ .Values.services.rabbitmq.queueTTL }}" - name: WEB_SERVICE_URI value: "http://{{ .Release.Name }}-funcx-web-service:8000" diff --git a/funcx/values.yaml b/funcx/values.yaml index 8556d6b..8dc42f9 100644 --- a/funcx/values.yaml +++ b/funcx/values.yaml @@ -66,6 +66,7 @@ services: rabbitmq: enabled: true externalHost: rabbitmq + queueTTL: 60 postgresql: postgresqlUsername: funcx From f969bb66379a79d502512a84e35f37f5233961fe Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Tue, 11 Jan 2022 11:51:13 -0600 Subject: [PATCH 2/2] increase ttl and indicate that it is in seconds --- funcx/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/funcx/values.yaml b/funcx/values.yaml index 8dc42f9..8d47920 100644 --- a/funcx/values.yaml +++ b/funcx/values.yaml @@ -66,7 +66,8 @@ services: rabbitmq: enabled: true externalHost: rabbitmq - queueTTL: 60 + # TTL in seconds + queueTTL: 604800 postgresql: postgresqlUsername: funcx