From 5e6b58e8219e103f502e04b9a69042274b9cb59c Mon Sep 17 00:00:00 2001 From: Iain Sproat <68657+iainsproat@users.noreply.github.com> Date: Thu, 26 Jun 2025 19:10:40 +0100 Subject: [PATCH] fix(helm chart): correctly set `MAX_OBJECT_SIZE_MB` & fix typo in `connectionCreateTimeoutMillis` (#4993) --- packages/fileimport-service/src/controller/api.ts | 2 +- .../templates/fileimport_service/deployment.yml | 2 +- utils/helm/speckle-server/values.schema.json | 2 +- utils/helm/speckle-server/values.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/fileimport-service/src/controller/api.ts b/packages/fileimport-service/src/controller/api.ts index 485016b13..f42136e1e 100644 --- a/packages/fileimport-service/src/controller/api.ts +++ b/packages/fileimport-service/src/controller/api.ts @@ -165,7 +165,7 @@ export class ServerAPI { } prepInsertionObject(streamId: string, obj: SpeckleObject): SpeckleObjectWithId { - const maximumObjectSizeMB = parseInt(process.env['MAX_OBJECT_SIZE_MB'] || '10') + const maximumObjectSizeMB = parseInt(process.env['MAX_OBJECT_SIZE_MB'] || '100') const MAX_OBJECT_SIZE = maximumObjectSizeMB * 1024 * 1024 if (obj.hash) obj.id = obj.hash diff --git a/utils/helm/speckle-server/templates/fileimport_service/deployment.yml b/utils/helm/speckle-server/templates/fileimport_service/deployment.yml index abac7e302..b280d7553 100644 --- a/utils/helm/speckle-server/templates/fileimport_service/deployment.yml +++ b/utils/helm/speckle-server/templates/fileimport_service/deployment.yml @@ -139,7 +139,7 @@ spec: {{- if (not .Values.featureFlags.nextGenFileImporterEnabled) }} # DEPRECATED - name: MAX_OBJECT_SIZE_MB - value: {{ .Values.objects.max_object_size_mb | quote }} + value: {{ .Values.server.max_object_size_mb | quote }} {{- end }} {{- if (and .Values.featureFlags.workspacesMultiRegionEnabled (not .Values.featureFlags.nextGenFileImporterEnabled)) }} - name: FF_WORKSPACES_MULTI_REGION_ENABLED diff --git a/utils/helm/speckle-server/values.schema.json b/utils/helm/speckle-server/values.schema.json index 5253599f3..16ae24923 100644 --- a/utils/helm/speckle-server/values.schema.json +++ b/utils/helm/speckle-server/values.schema.json @@ -286,7 +286,7 @@ "description": "The maximum time in milliseconds to wait for a connection to be acquired from the connection pool.", "default": 15000 }, - "connectionCreationTimeoutMillis": { + "connectionCreateTimeoutMillis": { "type": "number", "description": "The maximum time in milliseconds to wait for a new connection to be created in the connection pool. Should be less than the acquisition timeout, as a new connection may need to be created then acquired.", "default": 5000 diff --git a/utils/helm/speckle-server/values.yaml b/utils/helm/speckle-server/values.yaml index aef731e73..f07725c66 100644 --- a/utils/helm/speckle-server/values.yaml +++ b/utils/helm/speckle-server/values.yaml @@ -223,9 +223,9 @@ db: ## @param db.connectionAcquisitionTimeoutMillis The maximum time in milliseconds to wait for a connection to be acquired from the connection pool. ## connectionAcquisitionTimeoutMillis: 15000 - ## @param db.connectionCreationTimeoutMillis The maximum time in milliseconds to wait for a new connection to be created in the connection pool. Should be less than the acquisition timeout, as a new connection may need to be created then acquired. + ## @param db.connectionCreateTimeoutMillis The maximum time in milliseconds to wait for a new connection to be created in the connection pool. Should be less than the acquisition timeout, as a new connection may need to be created then acquired. ## - connectionCreationTimeoutMillis: 5000 + connectionCreateTimeoutMillis: 5000 ## @param db.knexAsyncStackTracesEnabled If enabled, will provide better stack traces for errors arising out of knex operations ## knexAsyncStackTracesEnabled: false