Thanks to visit codestin.com
Credit goes to github.com

Skip to content

spanner-jdbc: Fix possible IllegalArgumentException in SingleUseTransaction #6175

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
olavloite merged 2 commits into from
Aug 29, 2019
Merged

spanner-jdbc: Fix possible IllegalArgumentException in SingleUseTransaction #6175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb98612
remove fireAndForget rollback as it could cause an IAE
olavloite Aug 27, 2019
a4a8fc3
added comments to clearify how the tx is rollbacked
olavloite Aug 28, 2019
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
97 changes: 30 additions & 67 deletions ...-cloud-spanner-jdbc/src/main/java/com/google/cloud/spanner/jdbc/SingleUseTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

/**
Expand Down Expand Up @@ -365,23 +363,25 @@ private abstract class AbstractUpdateCallable<T> implements Callable<T> {

@Override
public T call() throws Exception {
txManager = dbClient.transactionManager();
// Check the interrupted state after each (possible) round-trip to the db to allow the
// statement to be cancelled.
checkInterrupted();
try (TransactionContext txContext =
txManager.getState()
== com.google.cloud.spanner.TransactionManager.TransactionState.ABORTED
? txManager.resetForRetry()
: txManager.begin()) {
checkInterrupted();
T res = executeUpdate(txContext);
checkInterrupted();
txManager.commit();
try {
txManager = dbClient.transactionManager();
// Check the interrupted state after each (possible) round-trip to the db to allow the
// statement to be cancelled.
checkInterrupted();
return res;
try (TransactionContext txContext = txManager.begin()) {
checkInterrupted();
T res = executeUpdate(txContext);
checkInterrupted();
txManager.commit();
checkInterrupted();
return res;
}
} finally {
txManager.close();
if (txManager != null) {
// Calling txManager.close() will rollback the transaction if it is still active, i.e. if
// an error occurred before the commit() call returned successfully.
txManager.close();
}
}
}
}
Expand Down Expand Up @@ -424,32 +424,22 @@ private <T> T executeAsyncTransactionalUpdate(
// handle timeouts and canceling of a statement.
while (true) {
try {
return asyncExecuteStatement(update, callable);
} catch (AbortedException e) {
try {
return asyncExecuteStatement(update, callable);
} catch (AbortedException e) {
try {
Thread.sleep(e.getRetryDelayInMillis() / 1000);
} catch (InterruptedException e1) {
throw SpannerExceptionFactory.newSpannerException(
ErrorCode.CANCELLED, "Statement execution was interrupted", e1);
}
// Check whether the timeout time has been exceeded.
long executionTime = System.currentTimeMillis() - startedTime;
if (getStatementTimeout().hasTimeout()
&& executionTime > getStatementTimeout().getTimeoutValue(TimeUnit.MILLISECONDS)) {
throw SpannerExceptionFactory.newSpannerException(
ErrorCode.DEADLINE_EXCEEDED,
"Statement execution timeout occurred for " + update.getSqlWithoutComments());
}
Thread.sleep(e.getRetryDelayInMillis() / 1000);
} catch (InterruptedException e1) {
throw SpannerExceptionFactory.newSpannerException(
ErrorCode.CANCELLED, "Statement execution was interrupted", e1);
}
} catch (Exception e) {
if (txManager != null) {
if (txManager.getState()
== com.google.cloud.spanner.TransactionManager.TransactionState.STARTED) {
fireAndForgetRollbackAndCloseTxManager(txManager);
}
// Check whether the timeout time has been exceeded.
long executionTime = System.currentTimeMillis() - startedTime;
if (getStatementTimeout().hasTimeout()
&& executionTime > getStatementTimeout().getTimeoutValue(TimeUnit.MILLISECONDS)) {
throw SpannerExceptionFactory.newSpannerException(
ErrorCode.DEADLINE_EXCEEDED,
"Statement execution timeout occurred for " + update.getSqlWithoutComments());
}
throw e;
}
}
}
Expand All @@ -460,33 +450,6 @@ private void checkInterrupted() throws InterruptedException {
}
}

/**
* Do a fire-and-forget rollback and close the transaction manager. Fire-and-forget is ok as Cloud
* Spanner will abort the transaction automatically after a while if the rollback request should
* not actually reach Cloud Spanner.
*/
private void fireAndForgetRollbackAndCloseTxManager(final TransactionManager txManager) {
Preconditions.checkNotNull(txManager);
Preconditions.checkArgument(
txManager.getState()
== com.google.cloud.spanner.TransactionManager.TransactionState.STARTED);
ExecutorService rollbackExecutor =
Executors.newSingleThreadExecutor(new ConnectionImpl.DaemonThreadFactory());
rollbackExecutor.submit(
new Callable<Void>() {
@Override
public Void call() throws Exception {
try {
txManager.rollback();
return null;
} finally {
txManager.close();
}
}
});
rollbackExecutor.shutdown();
}

@Override
public void write(final Mutation mutation) {
write(Arrays.asList(mutation));
Expand Down