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

fix: Catch retryable exceptions thrown by SDN itself. (#2945)

Browse Source 
This fix #2944 by making the retryable exception messages consistent by introducing constants for prematurely closed transactions and sessions omitting the trailing dot as agreed within the bigger Spring Data team.
This commit is contained in:
GregDThomas
2024-08-27 12:33:02 +01:00
committed by Michael Simons
parent 8e3152fc9c
commit baa7fbbcc6
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/springframework/data/neo4j/core/support/RetryExceptionPredicate.java
View File

@@ -26,6 +26,7 @@ import org.neo4j.driver.exceptions.SessionExpiredException;
import org.neo4j.driver.exceptions.TransientException;
import org.springframework.dao.TransientDataAccessResourceException;
/**
* A predicate indicating {@literal true} for {@link Throwable throwables} that can be safely retried and {@literal false}
* in any other case. This predicate can be used for example with Resilience4j.
@@ -37,9 +38,12 @@ import org.springframework.dao.TransientDataAccessResourceException;
@API(status = API.Status.STABLE, since = "6.0")
public final class RetryExceptionPredicate implements Predicate<Throwable> {
public static final String TRANSACTION_MUST_BE_OPEN_BUT_HAS_ALREADY_BEEN_CLOSED = "Transaction must be open, but has already been closed";
public static final String SESSION_MUST_BE_OPEN_BUT_HAS_ALREADY_BEEN_CLOSED = "Session must be open, but has already been closed";
private static final Set<String> RETRYABLE_ILLEGAL_STATE_MESSAGES = Set.of(
"Transaction must be open, but has already been closed.",
"Session must be open, but has already been closed.");
TRANSACTION_MUST_BE_OPEN_BUT_HAS_ALREADY_BEEN_CLOSED,
SESSION_MUST_BE_OPEN_BUT_HAS_ALREADY_BEEN_CLOSED
);
@Override
public boolean test(Throwable throwable) {

7
src/main/java/org/springframework/data/neo4j/core/transaction/Neo4jTransactionHolder.java
View File

@@ -22,6 +22,7 @@ import org.neo4j.driver.Session;
import org.neo4j.driver.Transaction;
import org.springframework.data.neo4j.core.DatabaseSelection;
import org.springframework.data.neo4j.core.UserSelection;
import org.springframework.data.neo4j.core.support.RetryExceptionPredicate;
import org.springframework.lang.Nullable;
import org.springframework.transaction.support.ResourceHolderSupport;
import org.springframework.util.Assert;
@@ -68,7 +69,7 @@ final class Neo4jTransactionHolder extends ResourceHolderSupport {
Collection<Bookmark> commit() {
Assert.state(hasActiveTransaction(), "Transaction must be open, but has already been closed");
Assert.state(hasActiveTransaction(), RetryExceptionPredicate.TRANSACTION_MUST_BE_OPEN_BUT_HAS_ALREADY_BEEN_CLOSED);
Assert.state(!isRollbackOnly(), "Resource must not be marked as rollback only");
transaction.commit();
@@ -79,7 +80,7 @@ final class Neo4jTransactionHolder extends ResourceHolderSupport {
void rollback() {
Assert.state(hasActiveTransaction(), "Transaction must be open, but has already been closed");
Assert.state(hasActiveTransaction(), RetryExceptionPredicate.TRANSACTION_MUST_BE_OPEN_BUT_HAS_ALREADY_BEEN_CLOSED);
transaction.rollback();
transaction.close();
@@ -87,7 +88,7 @@ final class Neo4jTransactionHolder extends ResourceHolderSupport {
void close() {
Assert.state(hasActiveSession(), "Session must be open, but has already been closed");
Assert.state(hasActiveSession(), RetryExceptionPredicate.SESSION_MUST_BE_OPEN_BUT_HAS_ALREADY_BEEN_CLOSED);
if (hasActiveTransaction()) {
transaction.close();

4
src/test/java/org/springframework/data/neo4j/core/support/RetryExceptionPredicateTest.java
View File

@@ -34,8 +34,8 @@ import org.springframework.data.neo4j.core.Neo4jPersistenceExceptionTranslator;
class RetryExceptionPredicateTest {
@ParameterizedTest
@ValueSource(strings = { "Transaction must be open, but has already been closed.",
"Session must be open, but has already been closed." })
@ValueSource(strings = { "Transaction must be open, but has already been closed",
"Session must be open, but has already been closed" })
void shouldRetryOnSomeIllegalStateExceptions(String msg) {
RetryExceptionPredicate predicate = new RetryExceptionPredicate();