diff --git a/bin/worker b/bin/worker index 840e9128..2899cce4 100755 --- a/bin/worker +++ b/bin/worker @@ -10,6 +10,11 @@ if ENV['AAPB_HOST'] %x{mkdir ~/.ssh && ssh-keyscan $AAPB_HOST >> ~/.ssh/known_hosts} end +# Dynamically set SIDEKIQ_CONCURRENCY based on the worker type +if ENV['IMPORT_WORKER_SIDEKIQ_CONCURRENCY'] + ENV['SIDEKIQ_CONCURRENCY'] = ENV.fetch('IMPORT_WORKER_SIDEKIQ_CONCURRENCY', '10') +end + queues = if !ARGV.empty? ' -q ' + ARGV.join(' -q ') else diff --git a/hyrax/templates/import-deployment-worker.yaml b/hyrax/templates/import-deployment-worker.yaml index 5f6fc7a4..ae8045dd 100644 --- a/hyrax/templates/import-deployment-worker.yaml +++ b/hyrax/templates/import-deployment-worker.yaml @@ -1,4 +1,4 @@ -{{- if .Values.worker.enabled }} +{{- if .Values.importWorker.enabled }} apiVersion: apps/v1 kind: Deployment metadata: diff --git a/ops/demo-deploy.tmpl.yaml b/ops/demo-deploy.tmpl.yaml index 2d9cea42..8a879b40 100644 --- a/ops/demo-deploy.tmpl.yaml +++ b/ops/demo-deploy.tmpl.yaml @@ -151,9 +151,12 @@ worker: extraEnvVars: *envVars importWorker: + enabled: true + # extraEnvVars will not handle overriden values + # only additional to the original workerEnvVars list extraEnvVars: - - name: SIDEKIQ_CONCURRENCY - value: "10" + - name: IMPORT_WORKER_SIDEKIQ_CONCURRENCY + value: "20" podSecurityContext: runAsUser: 1001