Skip to content

Commit 1a9cb3b

Browse files
laimis9133nineinchnick
authored andcommitted
Allow list syntax for exchangeManager baseDir targets
This change will allow using list syntax of exchangeManager base-directories which is more common and understandable with Helm charts. Trino allows specifying multiple spooling targets for exchageManager separated by commas when using main cloud providers or any S3 compatible protocol (example: s3://bucket1,s3://bucket2,s3://bucket3). With current trinodb/chart we have to specify them within values as a single line for baseDir: server: exchangeManager: name: "filesystem" baseDir: "s3://exchange-spooling-bucket-1,s3://exchange-spooling-bucket-2" Which translates to: exchange-manager.properties: | exchange-manager.name=filesystem exchange.base-directories=s3://exchange-spooling-bucket-1,s3://exchange-spooling-bucket-2 This change allows a more clean listing within values: server: exchangeManager: name: "filesystem" baseDir: - "s3://exchange-spooling-bucket-1" - "s3://exchange-spooling-bucket-2" Which translates to the same: exchange-manager.properties: | exchange-manager.name=filesystem exchange.base-directories=s3://exchange-spooling-bucket-1,s3://exchange-spooling-bucket-2 It will not break any existing listings as stating them the same way as before in a single line will result in exchange.base-directories within a single line. Documentation for setting up fault tolerant execution: https://trino.io/docs/current/admin/fault-tolerant-execution.html Chart documentation has been also updated. Default usage example has been changed to a listed view with a minor clean up of the overall description.
1 parent bcf5409 commit 1a9cb3b

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

charts/trino/templates/configmap-coordinator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ data:
124124
{{- if .Values.server.exchangeManager }}
125125
exchange-manager.properties: |
126126
exchange-manager.name={{ .Values.server.exchangeManager.name }}
127-
exchange.base-directories={{ .Values.server.exchangeManager.baseDir }}
127+
exchange.base-directories={{ join "," .Values.server.exchangeManager.baseDir }}
128128
{{- range $configValue := .Values.additionalExchangeManagerProperties }}
129129
{{ $configValue }}
130130
{{- end }}

charts/trino/templates/configmap-worker.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ data:
8181
{{- if .Values.server.exchangeManager }}
8282
exchange-manager.properties: |
8383
exchange-manager.name={{ .Values.server.exchangeManager.name }}
84-
exchange.base-directories={{ .Values.server.exchangeManager.baseDir }}
84+
exchange.base-directories={{ join "," .Values.server.exchangeManager.baseDir }}
8585
{{- range $configValue := .Values.additionalExchangeManagerProperties }}
8686
{{ $configValue }}
8787
{{- end }}

charts/trino/values.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,17 @@ server:
6262
exchangeManager: {}
6363
# server.exchangeManager -- Mandatory [exchange manager
6464
# configuration](https://trino.io/docs/current/admin/fault-tolerant-execution.html#id1).
65-
# Used to set the name and location(s) of the spooling storage destination. To enable fault-tolerant execution,
66-
# set the `retry-policy` property in `additionalConfigProperties`. Additional exchange manager configurations can be
67-
# added to `additionalExchangeManagerProperties`.
65+
# Used to set the name and location(s) of spooling data storage. For multiple destinations use a list or a comma separated URI locations.
66+
# To enable fault-tolerant execution, set the `retry-policy` property in `additionalConfigProperties`.
67+
# Additional exchange manager configurations can be added to `additionalExchangeManagerProperties`.
6868
# @raw
6969
# Example:
7070
# ```yaml
7171
# server:
7272
# exchangeManager:
7373
# name: "filesystem"
74-
# baseDir: "/tmp/trino-local-file-system-exchange-manager"
74+
# baseDir:
75+
# - "/tmp/trino-local-file-system-exchange-manager"
7576
# additionalConfigProperties:
7677
# - retry-policy=TASK
7778
# additionalExchangeManagerProperties:

0 commit comments

Comments
 (0)