[Backport to 3.3.x][Fixes #9064] Improve Upload Workflow resources st…

…ate management] (#9065)

* [Fixes #9064Improve Upload Workflow resources state management]

* [Fixes #9064] Improve Upload Workflow resources state management

* [Fixes #9064] Improve Upload Workflow resources state management

geonode/base/models.py

@@ -1392,6 +1392,8 @@ def clear_dirty_state(self):
     def set_processing_state(self, state):
         if state == "PROCESSED":
             self.clear_dirty_state()
+        else:
+            self.set_dirty_state()
 
     @property
     def processed(self):

geonode/br/tasks.py

@@ -30,12 +30,13 @@
     name='geonode.br.tasks.restore_notification',
     queue='email',
     expires=600,
+    time_limit=600,
     acks_late=False,
     autoretry_for=(Exception, ),
-    retry_kwargs={'max_retries': 3, 'countdown': 10},
-    retry_backoff=True,
-    retry_backoff_max=700,
-    retry_jitter=True)
+    retry_kwargs={'max_retries': 5},
+    retry_backoff=3,
+    retry_backoff_max=30,
+    retry_jitter=False)
 def restore_notification(recipients: List, backup_file: str, backup_md5: str, exception: str = None):
     """
     Function sending a CC email report of the restore procedure to a provided emails.

geonode/documents/tasks.py

@@ -36,12 +36,13 @@
     name='geonode.documents.tasks.create_document_thumbnail',
     queue='geonode',
     expires=600,
+    time_limit=600,
     acks_late=False,
     autoretry_for=(Exception, ),
-    retry_kwargs={'max_retries': 2, 'countdown': 10},
-    retry_backoff=True,
-    retry_backoff_max=700,
-    retry_jitter=True)
+    retry_kwargs={'max_retries': 5},
+    retry_backoff=3,
+    retry_backoff_max=30,
+    retry_jitter=False)
 def create_document_thumbnail(self, object_id):
     """
     Create thumbnail for a document.
@@ -118,12 +119,13 @@ def create_document_thumbnail(self, object_id):
     name='geonode.documents.tasks.delete_orphaned_document_files',
     queue='cleanup',
     expires=600,
+    time_limit=600,
     acks_late=False,
     autoretry_for=(Exception, ),
-    retry_kwargs={'max_retries': 2, 'countdown': 10},
-    retry_backoff=True,
-    retry_backoff_max=700,
-    retry_jitter=True)
+    retry_kwargs={'max_retries': 5},
+    retry_backoff=3,
+    retry_backoff_max=30,
+    retry_jitter=False)
 def delete_orphaned_document_files(self):
     from geonode.documents.utils import delete_orphaned_document_files
     delete_orphaned_document_files()
@@ -134,12 +136,13 @@ def delete_orphaned_document_files(self):
     name='geonode.documents.tasks.delete_orphaned_thumbnails',
     queue='cleanup',
     expires=600,
+    time_limit=600,
     acks_late=False,
     autoretry_for=(Exception, ),
-    retry_kwargs={'max_retries': 2, 'countdown': 10},
-    retry_backoff=True,
-    retry_backoff_max=700,
-    retry_jitter=True)
+    retry_kwargs={'max_retries': 5},
+    retry_backoff=3,
+    retry_backoff_max=30,
+    retry_jitter=False)
 def delete_orphaned_thumbnails(self):
     from geonode.base.utils import delete_orphaned_thumbs
     delete_orphaned_thumbs()