Skip to content

FINERACT-2525: Accept MariaDB snapshot isolation conflict responses in savings integration tests #5763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
udayagiri-sivasai-dev wants to merge 3 commits into
base: develop
Choose a base branch
from
+15 −7
Open

FINERACT-2525: Accept MariaDB snapshot isolation conflict responses in savings integration tests #5763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2278fc7
FINERACT-2525 accept MariaDB snapshot isolation conflict responses in…
udayagiri-sivasai-dev Apr 13, 2026
ea8ae6d
Fix Spotless formatting
udayagiri-sivasai-dev Apr 24, 2026
da0aff2
Use constant for snapshot isolation message
udayagiri-sivasai-dev Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...ct-core/src/main/java/org/apache/fineract/infrastructure/core/exception/ErrorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ private enum PessimisticLockingFailureCode {

ROLLBACK("40"), // Transaction rollback
DEADLOCK("60"), // Oracle: deadlock
HY00("HY", "Lock wait timeout exceeded"), // MySql deadlock HY00
;
HY00("HY", "Lock wait timeout exceeded"), SNAPSHOT_CONFLICT("HY", "Record has changed since last read");

private final String code;
private final String msg;
Expand Down
19 changes: 14 additions & 5 deletions ...sts/src/test/java/org/apache/fineract/integrationtests/SavingsAccountTransactionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
public class SavingsAccountTransactionTest {

private static final Logger log = LoggerFactory.getLogger(SavingsAccountTransactionTest.class);

private static final String RECORD_CHANGED_SINCE_LAST_READ = "Record has changed since last read";
public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL";
final String startDateString = "03 June 2023";
final String depositDateString = "05 June 2023";
Expand Down Expand Up @@ -381,8 +381,12 @@ public void run() {
assertNotNull(responses, "Responses");
if (enclosingTransaction) {
Integer statusCode1 = responses.get(0).getStatusCode();
String msg1 = Strings.nullToEmpty(responses.get(0).getBody());
assertNotNull(statusCode1, "First enlosingTransaction response status code");
assertTrue(SC_OK == statusCode1 || SC_CONFLICT == statusCode1, "Status code: " + statusCode1);
assertTrue(
SC_OK == statusCode1 || SC_CONFLICT == statusCode1
|| (SC_FORBIDDEN == statusCode1 && msg1.contains(RECORD_CHANGED_SINCE_LAST_READ)),
"Status code: " + statusCode1 + ", message: " + msg1);
if (SC_OK == statusCode1) {
assertEquals(4, responses.size(), "Response size for enlosingTransaction OK response");
Integer statusCode4 = responses.get(3).getStatusCode();
Expand All @@ -394,16 +398,20 @@ public void run() {
} else {
assertEquals(4, responses.size(), "Response size for without-enlosingTransaction response");
Integer statusCode1 = responses.get(0).getStatusCode();
String msg1 = Strings.nullToEmpty(responses.get(0).getBody());
assertNotNull(statusCode1, "First without-enlosingTransaction response status code");
assertTrue(SC_OK == statusCode1 || SC_CONFLICT == statusCode1,
"First without-enlosingTransaction response status code: " + statusCode1);
assertTrue(
SC_OK == statusCode1 || SC_CONFLICT == statusCode1
|| (SC_FORBIDDEN == statusCode1 && msg1.contains(RECORD_CHANGED_SINCE_LAST_READ)),
"First without-enlosingTransaction response status code: " + statusCode1 + ", message: " + msg1);
Integer statusCode4 = responses.get(3).getStatusCode();
assertNotNull(statusCode4, "Last without-enlosingTransaction response status code");
assertTrue(
SC_OK == statusCode1 ? (SC_OK == statusCode4 || SC_CONFLICT == statusCode4)
: (SC_FORBIDDEN == statusCode4 || SC_CONFLICT == statusCode4),
"Last without-enlosingTransaction response status code: " + statusCode4);
}

} else {
String json = transactionData.getJson();
String response = (String) this.savingsHelper.depositToSavingsAccount(savingsId, json, null);
Expand Down Expand Up @@ -445,7 +453,8 @@ private void runDeadlockBatch(SavingsAccountHelper savingsHelper, Integer saving
assertNotNull(statusCode, "First response status code");
assertTrue(
SC_OK == statusCode || SC_CONFLICT == statusCode
|| (SC_FORBIDDEN == statusCode && msg.contains("Cannot add or update a child row")),
|| (SC_FORBIDDEN == statusCode
&& (msg.contains("Cannot add or update a child row") || msg.contains(RECORD_CHANGED_SINCE_LAST_READ))),
"Status code: " + statusCode + ", message: " + msg);
if (SC_OK == statusCode) {
assertEquals(4, responses.size(), "Response size for OK response");
Expand Down