Merge pull request ckan#6638 from qld-gov-au/site-user-creation-race

[QOL-8368] fix race condition in creating the default site user
FlavorFlav · Feb 4, 2022 · 8723840 · 8723840
2 parents df0079e + 12d7edb
commit 8723840
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ckan/config/environment.py b/ckan/config/environment.py
@@ -227,6 +227,9 @@ def update_config():
     except (sqlalchemy.exc.ProgrammingError, sqlalchemy.exc.OperationalError):
         # The database is not yet initialised. It happens in `ckan db init`
         pass
+    except sqlalchemy.exc.IntegrityError:
+        # Race condition, user already exists.
+        pass
 
     # Close current session and open database connections to ensure a clean
     # clean environment even if an error occurs later on