[Backport to 3.3.x][Fixes #9166] Upload Workflow: The upload api keep…

…s calling the "final" step causing inconsistent states (#9171)

geonode/upload/models.py

@@ -277,8 +277,6 @@ def set_processing_state(self, state):
             Upload.objects.filter(id=self.id).update(state=state)
         if self.layer:
             self.layer.set_processing_state(state)
-            if self.state != Upload.STATE_PROCESSED:
-                self.layer.set_dirty_state()
 
     def __str__(self):
         return f'Upload [{self.pk}] gs{self.import_id} - {self.name}, {self.user}'

geonode/upload/tasks.py

@@ -86,7 +86,7 @@ def finalize_incomplete_session_uploads(self, *args, **kwargs):
 
     # Let's finish the valid ones
     session = None
-    for _upload in Upload.objects.exclude(state__in=[Upload.STATE_RUNNING, Upload.STATE_PROCESSED, Upload.STATE_INVALID]).exclude(id__in=_upload_ids_expired):
+    for _upload in Upload.objects.exclude(state__in=[Upload.STATE_PROCESSED, Upload.STATE_INVALID]).exclude(id__in=_upload_ids_expired):
         try:
             if not _upload.import_id:
                 raise NotFound

geonode/upload/views.py

@@ -780,16 +780,13 @@ def view(req, step=None):
                 upload_session = _get_upload_session(req)
             if upload_session:
                 Upload.objects.update_from_session(upload_session)
-            if resp_js and isinstance(resp_js, dict):
+            if not settings.ASYNC_SIGNALS and resp_js and isinstance(resp_js, dict):
                 _success = resp_js.get('success', False)
                 _redirect_to = resp_js.get('redirect_to', '')
                 _required_input = resp_js.get('required_input', False)
                 if _success and (_required_input or 'upload/final' in _redirect_to):
                     from geonode.upload.tasks import finalize_incomplete_session_uploads
-                    if settings.ASYNC_SIGNALS:
-                        finalize_incomplete_session_uploads.apply_async()
-                    else:
-                        finalize_incomplete_session_uploads.apply()
+                    finalize_incomplete_session_uploads.apply()
         return resp
     except BadStatusLine:
         logger.exception('bad status line, geoserver down?')