Skip to content

Resolve transaction manager race condition #13065

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
arhimondr merged 1 commit into from
Jul 5, 2022
Merged

Resolve transaction manager race condition #13065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion core/trino-main/src/main/java/io/trino/execution/CallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public ListenableFuture<Void> execute(
List<Expression> parameters,
WarningCollector warningCollector)
{
if (!transactionManager.isAutoCommit(stateMachine.getSession().getRequiredTransactionId())) {
if (!transactionManager.getTransactionInfo(stateMachine.getSession().getRequiredTransactionId()).isAutoCommitContext()) {
throw new TrinoException(NOT_SUPPORTED, "Procedures cannot be called within a transaction (use autocommit mode)");
}

Expand Down
26 changes: 14 additions & 12 deletions 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 @@ -48,6 +48,7 @@
import io.trino.sql.planner.PlanFragment;
import io.trino.sql.planner.plan.TableScanNode;
import io.trino.transaction.TransactionId;
import io.trino.transaction.TransactionInfo;
import io.trino.transaction.TransactionManager;
import org.joda.time.DateTime;

Expand Down Expand Up @@ -917,9 +918,9 @@ public boolean transitionToFinishing()
return true;
}

Optional<TransactionId> transactionId = session.getTransactionId();
if (transactionId.isPresent() && transactionManager.transactionExists(transactionId.get()) && transactionManager.isAutoCommit(transactionId.get())) {
ListenableFuture<Void> commitFuture = transactionManager.asyncCommit(transactionId.get());
Optional<TransactionInfo> transaction = session.getTransactionId().flatMap(transactionManager::getTransactionInfoIfExist);
if (transaction.isPresent() && transaction.get().isAutoCommitContext()) {
ListenableFuture<Void> commitFuture = transactionManager.asyncCommit(transaction.get().getTransactionId());
Futures.addCallback(commitFuture, new FutureCallback<>()
{
@Override
Expand Down Expand Up @@ -967,18 +968,19 @@ public boolean transitionToFailed(Throwable throwable)

try {
QUERY_STATE_LOG.debug(throwable, "Query %s failed", queryId);
session.getTransactionId().ifPresent(transactionId -> {
session.getTransactionId().flatMap(transactionManager::getTransactionInfoIfExist).ifPresent(transaction -> {
try {
if (transactionManager.transactionExists(transactionId) && transactionManager.isAutoCommit(transactionId)) {
transactionManager.asyncAbort(transactionId);
return;
if (transaction.isAutoCommitContext()) {
transactionManager.asyncAbort(transaction.getTransactionId());
}
else {
transactionManager.fail(transaction.getTransactionId());
}
}
catch (RuntimeException e) {
// This shouldn't happen but be safe and just fail the transaction directly
QUERY_STATE_LOG.error(e, "Error aborting transaction for failed query. Transaction will be failed directly");
}
transactionManager.fail(transactionId);
});
}
finally {
Expand All @@ -1003,12 +1005,12 @@ public boolean transitionToCanceled()

boolean canceled = queryState.setIf(FAILED, currentState -> !currentState.isDone());
if (canceled) {
session.getTransactionId().ifPresent(transactionId -> {
if (transactionManager.isAutoCommit(transactionId)) {
transactionManager.asyncAbort(transactionId);
session.getTransactionId().flatMap(transactionManager::getTransactionInfoIfExist).ifPresent(transaction -> {
if (transaction.isAutoCommitContext()) {
transactionManager.asyncAbort(transaction.getTransactionId());
}
else {
transactionManager.fail(transactionId);
transactionManager.fail(transaction.getTransactionId());
}
});
}
Expand Down
6 changes: 6 additions & 0 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 @@ -148,6 +148,12 @@ public TransactionInfo getTransactionInfo(TransactionId transactionId)
return getTransactionMetadata(transactionId).getTransactionInfo();
}

@Override
public Optional<TransactionInfo> getTransactionInfoIfExist(TransactionId transactionId)
{
return tryGetTransactionMetadata(transactionId).map(TransactionMetadata::getTransactionInfo);
}

@Override
public List<TransactionInfo> getAllTransactionInfos()
{
Expand Down
6 changes: 6 additions & 0 deletions core/trino-main/src/main/java/io/trino/transaction/NoOpTransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ public TransactionInfo getTransactionInfo(TransactionId transactionId)
throw new UnsupportedOperationException();
}

@Override
public Optional<TransactionInfo> getTransactionInfoIfExist(TransactionId transactionId)
{
throw new UnsupportedOperationException();
}

@Override
public List<TransactionInfo> getAllTransactionInfos()
{
Expand Down
7 changes: 2 additions & 5 deletions core/trino-main/src/main/java/io/trino/transaction/TransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,10 @@ public interface TransactionManager

boolean transactionExists(TransactionId transactionId);

default boolean isAutoCommit(TransactionId transactionId)
{
return getTransactionInfo(transactionId).isAutoCommitContext();
}

TransactionInfo getTransactionInfo(TransactionId transactionId);

Optional<TransactionInfo> getTransactionInfoIfExist(TransactionId transactionId);

List<TransactionInfo> getAllTransactionInfos();

TransactionId beginTransaction(boolean autoCommitContext);
Expand Down
9 changes: 9 additions & 0 deletions core/trino-main/src/test/java/io/trino/transaction/TestingTransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@ public TransactionInfo getTransactionInfo(TransactionId transactionId)
Optional.empty()); // write catalog
}

@Override
public Optional<TransactionInfo> getTransactionInfoIfExist(TransactionId transactionId)
{
if (transactions.containsKey(transactionId)) {
return Optional.of(getTransactionInfo(transactionId));
}
return Optional.empty();
}

@Override
public List<TransactionInfo> getAllTransactionInfos()
{
Expand Down