Merge pull request #383 from LCOGT/fix/no-instrument-size

Fix/no instrument size
LCOGT · Feb 7, 2024 · 561c966 · 561c966
2 parents 2ce0a23 + b361120
commit 561c966
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -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

diff --git a/banzai/main.py b/banzai/main.py
@@ -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

diff --git a/helm-chart/banzai/Chart.yaml b/helm-chart/banzai/Chart.yaml
@@ -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
diff --git a/helm-chart/banzai/templates/workers-large.yaml b/helm-chart/banzai/templates/workers-large.yaml
@@ -57,7 +57,7 @@ spec:
       volumes:
         - name: tmp
           emptyDir:
-            sizeLimit: 20Gi
+            sizeLimit: 40Gi
     {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}