Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-2467: JdbcLockReg: retry on TransDataAccessExc

Browse Source 
* GH-2467: JdbcLockRegistry should retry on DeadlockLoserDataAccessException

Fixes #2467

MySQL 5.7.15 introduced setting `innodb_deadlock_detect` (enabled by
default). As a result MySQL JDBC driver throws
`DeadlockLoserDataAccessException` when deadlock is detected.
`JdbcLockRegistry` doesn't handle it causing lock to be lost.

* Retry `doLock()` on data access deadlock instead of loosing the lock

* Use TransientDataAccessException instead of derived exceptions
This commit is contained in:
brempusz
2018-06-07 18:56:33 +02:00
committed by Artem Bilan
parent f9cea64a79
commit 4bb1a619a9
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/lock/JdbcLockRegistry.java
View File

@@ -26,14 +26,12 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import org.springframework.dao.CannotAcquireLockException; import org.springframework.dao.CannotAcquireLockException;
import org.springframework.dao.CannotSerializeTransactionException;
import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.DataAccessResourceFailureException;
import org.springframework.dao.QueryTimeoutException; import org.springframework.dao.TransientDataAccessException;
import org.springframework.integration.support.locks.DefaultLockRegistry; import org.springframework.integration.support.locks.DefaultLockRegistry;
import org.springframework.integration.support.locks.ExpirableLockRegistry; import org.springframework.integration.support.locks.ExpirableLockRegistry;
import org.springframework.integration.support.locks.LockRegistry; import org.springframework.integration.support.locks.LockRegistry;
import org.springframework.integration.util.UUIDConverter; import org.springframework.integration.util.UUIDConverter;
import org.springframework.transaction.TransactionTimedOutException;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
@@ -47,6 +45,7 @@ import org.springframework.util.Assert;
* @author Artem Bilan * @author Artem Bilan
* @author Vedran Pavic * @author Vedran Pavic
* @author Kai Zimmermann * @author Kai Zimmermann
* @author Bartosz Rempuszewski
* *
* @since 4.3 * @since 4.3
*/ */
@@ -113,7 +112,7 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
} }
break; break;
} }
catch (CannotSerializeTransactionException | TransactionTimedOutException | QueryTimeoutException e) { catch (TransientDataAccessException e) {
// try again // try again
} }
catch (InterruptedException e) { catch (InterruptedException e) {
@@ -147,7 +146,7 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
} }
break; break;
} }
catch (CannotSerializeTransactionException | TransactionTimedOutException | QueryTimeoutException e) { catch (TransientDataAccessException e) {
// try again // try again
} }
catch (InterruptedException ie) { catch (InterruptedException ie) {
@@ -191,7 +190,7 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
} }
return acquired; return acquired;
} }
catch (CannotSerializeTransactionException | TransactionTimedOutException | QueryTimeoutException e) { catch (TransientDataAccessException e) {
// try again // try again
} }
catch (Exception e) { catch (Exception e) {