Skip to content

Ignore already commited transaction during connector metrics collection #29169

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

Merged
findepi merged 3 commits into from
Apr 20, 2026
Merged

Ignore already commited transaction during connector metrics collection #29169

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
50868a4
Ignore already commited transaction
lukasz-stec Apr 20, 2026
506bb1d
empty: roll the dice 🎲'
lukasz-stec Apr 20, 2026
3421713
empty: roll the dice 🎲'
lukasz-stec Apr 20, 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
4 changes: 3 additions & 1 deletion core/trino-main/src/main/java/io/trino/execution/QueryStateMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
import static io.trino.server.DynamicFilterService.DynamicFiltersStats;
import static io.trino.spi.StandardErrorCode.NOT_FOUND;
import static io.trino.spi.StandardErrorCode.TRANSACTION_ALREADY_ABORTED;
import static io.trino.spi.StandardErrorCode.TRANSACTION_ALREADY_COMMITED;
import static io.trino.spi.StandardErrorCode.USER_CANCELED;
import static io.trino.spi.connector.StandardWarningCode.SPOOLING_NOT_SUPPORTED;
import static io.trino.spi.resourcegroups.QueryType.SELECT;
Expand Down Expand Up @@ -431,7 +432,8 @@ private void collectCatalogMetadataMetrics()
// the transaction can be committed or aborted concurrently, after the check is done.
}
catch (RuntimeException e) {
if (!(e instanceof TrinoException trinoException && TRANSACTION_ALREADY_ABORTED.toErrorCode().equals(trinoException.getErrorCode()))) {
if (!(e instanceof TrinoException trinoException && (TRANSACTION_ALREADY_ABORTED.toErrorCode().equals(trinoException.getErrorCode()) ||
TRANSACTION_ALREADY_COMMITED.toErrorCode().equals(trinoException.getErrorCode())))) {
QUERY_STATE_LOG.error(e, "Error collecting query catalog metadata metrics: %s", queryId);
}
}
Expand Down
5 changes: 3 additions & 2 deletions core/trino-main/src/main/java/io/trino/transaction/InMemoryTransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import static io.trino.spi.StandardErrorCode.MULTI_CATALOG_WRITE_CONFLICT;
import static io.trino.spi.StandardErrorCode.READ_ONLY_VIOLATION;
import static io.trino.spi.StandardErrorCode.TRANSACTION_ALREADY_ABORTED;
import static io.trino.spi.StandardErrorCode.TRANSACTION_ALREADY_COMMITED;
import static java.util.Objects.requireNonNull;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.stream.Collectors.toList;
Expand Down Expand Up @@ -384,7 +385,7 @@ public void checkOpenTransaction()
if (completedStatus != null) {
if (completedStatus) {
// Should not happen normally
throw new IllegalStateException("Current transaction already committed");
throw new TrinoException(TRANSACTION_ALREADY_COMMITED, "Current transaction already committed");
}
throw new TrinoException(TRANSACTION_ALREADY_ABORTED, "Current transaction is aborted, commands ignored until end of transaction block");
}
Expand Down Expand Up @@ -521,7 +522,7 @@ public synchronized ListenableFuture<Void> asyncAbort()
if (!completedSuccessfully.compareAndSet(null, false)) {
if (completedSuccessfully.get()) {
// Should not happen normally
return immediateFailedFuture(new IllegalStateException("Current transaction already committed"));
return immediateFailedFuture(new TrinoException(TRANSACTION_ALREADY_COMMITED, "Current transaction already committed"));
}
// Already done
return immediateVoidFuture();
Expand Down
1 change: 1 addition & 0 deletions core/trino-spi/src/main/java/io/trino/spi/StandardErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ public enum StandardErrorCode
INVALID_BRANCH_PROPERTY(136, USER_ERROR),
INVALID_DEFAULT_COLUMN_VALUE(137, USER_ERROR),
INVALID_GRACE_PERIOD(138, USER_ERROR),
TRANSACTION_ALREADY_COMMITED(139, USER_ERROR),

GENERIC_INTERNAL_ERROR(65536, INTERNAL_ERROR),
TOO_MANY_REQUESTS_FAILED(65537, INTERNAL_ERROR),
Expand Down