Issue 50488: Pre-register this data source's SQL error codes in Sprin…

…g to prevent deadlocks (#5528)
LabKey · May 24, 2024 · e7b4659 · e7b4659
1 parent d1fbb63
commit e7b4659
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/api/src/org/labkey/api/data/DbScope.java b/api/src/org/labkey/api/data/DbScope.java
@@ -53,6 +53,7 @@
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.data.xml.TablesDocument;
 import org.springframework.dao.DeadlockLoserDataAccessException;
+import org.springframework.jdbc.support.SQLErrorCodesFactory;
 
 import javax.naming.Binding;
 import javax.naming.Context;
@@ -549,6 +550,9 @@ private static LabKeyDataSource setPrimaryDataSource(Map<String, LabKeyDataSourc
             _provisionedTableCache = new SchemaTableInfoCache(this, true);
             _rds = _dialect.isRds(this);
             _escape = dbmd.getSearchStringEscape();
+
+            // Issue 50488: Pre-register this data source's SQL error codes in Spring to prevent deadlocks
+            SQLErrorCodesFactory.getInstance().registerDatabase(dataSource.getDataSource(), _databaseProductName);
         }
     }