Skip to content
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.

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

Remove the strandId when doing generateCombinedTransactionId in TransactionResourceManager #41800

Merged
merged 1 commit into from
Jan 2, 2024
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -589,11 +589,11 @@
}

private String generateCombinedTransactionId(String transactionId, String transactionBlockId) {
String compoundId = transactionId + ":" + transactionBlockId;
if (transactionBlockId.contains("_")) {
return compoundId;
// remove the strand id from the transaction block id
return transactionBlockId.split("_")[0];

Check warning on line 594 in bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java

View check run for this annotation

Codecov / codecov/patch

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java#L594

Added line #L594 was not covered by tests
}
return compoundId + "_" + Scheduler.getStrand().getId();
return transactionId + ":" + transactionBlockId;

Check warning on line 596 in bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java

View check run for this annotation

Codecov / codecov/patch

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/transactions/TransactionResourceManager.java#L596

Added line #L596 was not covered by tests
}

public void notifyResourceFailure(String gTransactionId) {
Expand Down
Loading