Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/no instrument size #383

Merged
merged 7 commits into from
Feb 7, 2024
Merged

Fix/no instrument size #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e9ae3a0
Bump helm chart version/app version
Aug 23, 2023
0d7ce32
Merge branch 'master' of github.com:LCOGT/banzai
Jan 23, 2024
53f4ecb
Quick hack to get processing working again.
Jan 23, 2024
66bbe89
Fix for null values in instrument and instrument size
Jan 29, 2024
3d608b6
Revert "Fix for null values in instrument and instrument size"
Jan 29, 2024
fa80dbd
Update changelog, up large worker volume to 40g
Jan 29, 2024
b361120
Add newline at EOF
Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.14.1 (2024-01-29)
-------------------
- Fix for null instrument/instrument size to allow processing to continue

1.14.0 (2024-01-22)
-------------------
- Split worker queues for small and large images
Expand Down
4 changes: 3 additions & 1 deletion banzai/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ def get_consumers(self, Consumer, channel):

def on_message(self, body, message):
instrument = LCOFrameFactory.get_instrument_from_header(body, self.runtime_context.db_address)
if instrument is not None and instrument.nx * instrument.ny > self.runtime_context.LARGE_WORKER_THRESHOLD:
if instrument is None or instrument.nx is None:
queue_name = self.runtime_context.CELERY_TASK_QUEUE_NAME
elif instrument.nx * instrument.ny > self.runtime_context.LARGE_WORKER_THRESHOLD:
queue_name = self.runtime_context.LARGE_WORKER_QUEUE
else:
queue_name = self.runtime_context.CELERY_TASK_QUEUE_NAME
Expand Down
4 changes: 2 additions & 2 deletions helm-chart/banzai/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: "1.10.0"
appVersion: "1.14.1"
description: A Helm chart to deploy the BANZAI pipeline
name: banzai
version: 1.10.0
version: 1.14.1
2 changes: 1 addition & 1 deletion helm-chart/banzai/templates/workers-large.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
volumes:
- name: tmp
emptyDir:
sizeLimit: 20Gi
sizeLimit: 40Gi
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
Loading