fix zone updating with concurrent sheet replace (#1839)

bihealth · Nov 29, 2023 · 5756f70 · 5756f70
1 parent 63d8fad
commit 5756f70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -44,6 +44,7 @@ Fixed
     - Opening redundant iRODS connection in server version retrieval (#1831)
 - **Landingzones**
     - No wait for async ``CurrentUserRetrieveAPIView`` call result (#1732, #1807)
+    - ``BaseLandingZoneStatusTask.set_status()`` failure with concurrent sheet replacing (#1839)
 - **Taskflowbackend**
     - ``project_create`` timeline event user reference (bihealth/sodar_core#1301, #1819)
 

diff --git a/landingzones/tasks_taskflow.py b/landingzones/tasks_taskflow.py
@@ -249,11 +249,12 @@ def set_status(cls, zone, flow_name, status, status_info, extra_data=None):
                 status_info[: STATUS_INFO_LEN - len(STATUS_TRUNCATE_MSG)]
                 + STATUS_TRUNCATE_MSG
             )
+        # Refresh in case sheets have been replaced (see issue #1839)
+        zone.refresh_from_db()
         zone.set_status(
             status=status,
             status_info=status_info if status_info else None,
         )
-        zone.refresh_from_db()
 
         if not extra_data:
             extra_data = {}