Merge pull request #94 from qld-gov-au/develop

Develop to master - handle potential deadlocks more gracefully
qld-gov-au · May 1, 2024 · 047ba79 · 047ba79
2 parents ad1361b + 310fc2b
commit 047ba79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ckanext/xloader/jobs.py b/ckanext/xloader/jobs.py
@@ -124,6 +124,7 @@ def xloader_data_into_datastore(input):
             if tries < MAX_RETRIES:
                 tries = tries + 1
                 log.info("Job %s failed due to temporary error [%s], retrying", job_id, e)
+                logger.info("Job failed due to temporary error [%s], retrying", e)
                 job_dict['status'] = 'pending'
                 job_dict['metadata']['tries'] = tries
                 enqueue_job(

diff --git a/ckanext/xloader/loader.py b/ckanext/xloader/loader.py
@@ -118,7 +118,7 @@ def _clear_datastore_resource(resource_id):
     '''
     engine = get_write_engine()
     with engine.begin() as conn:
-        conn.execute("SET LOCAL lock_timeout = '5s'")
+        conn.execute("SET LOCAL lock_timeout = '15s'")
         conn.execute('TRUNCATE TABLE "{}" RESTART IDENTITY'.format(resource_id))