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

INT-4178: Retry CannotSerializeTransactionException in JdbcLockRegistry

Browse Source 
JIRA: https://jira.spring.io/browse/INT-4178

The `JdbcLockRegistry` does not retry `CannotSerializeTransactionException` thrown by `DefaultLockRepository.acquire` which in turn causes `LockRegistryLeaderInitiator`s thread to get stuck.

* catch `CannotSerializeTransactionException` on `DefaultLockRepository.acquire` and ignore it to ensure a retry

**Cherry-pick to 4.3.x**
This commit is contained in:
Vedran Pavic
2016-12-01 10:35:52 +01:00
committed by Artem Bilan
parent 67332ad93a
commit 8198ff1861
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ 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.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;
@@ -43,6 +44,8 @@ import org.springframework.util.Assert;
* *
* @author Dave Syer * @author Dave Syer
* @author Artem Bilan * @author Artem Bilan
* @author Vedran Pavić
*
* @since 4.3 * @since 4.3
*/ */
public class JdbcLockRegistry implements ExpirableLockRegistry { public class JdbcLockRegistry implements ExpirableLockRegistry {
@@ -120,6 +123,9 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
} }
break; break;
} }
catch (CannotSerializeTransactionException e) {
// try again
}
catch (TransactionTimedOutException e) { catch (TransactionTimedOutException e) {
// try again // try again
} }
@@ -154,6 +160,9 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
} }
break; break;
} }
catch (CannotSerializeTransactionException e) {
// try again
}
catch (TransactionTimedOutException e) { catch (TransactionTimedOutException e) {
// try again // try again
} }
@@ -198,6 +207,9 @@ public class JdbcLockRegistry implements ExpirableLockRegistry {
} }
return acquired; return acquired;
} }
catch (CannotSerializeTransactionException e) {
// try again
}
catch (TransactionTimedOutException e) { catch (TransactionTimedOutException e) {
// try again // try again
} }