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

Skip to content

Spanner: Change default MinSessions to 100 #6429

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
skuruppu merged 7 commits into from
Oct 15, 2019
Merged

Spanner: Change default MinSessions to 100 #6429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ed6cb49
change default MinSessions to 100
olavloite Oct 3, 2019
6e2626f
fix test failures for the JDBC driver
olavloite Oct 3, 2019
181cfcc
fix JDBC integration tests
olavloite Oct 4, 2019
8915afb
remove commented code
olavloite Oct 4, 2019
dab2bae
fix internal error in mock spanner
olavloite Oct 4, 2019
448d4b4
fix potential npe
olavloite Oct 4, 2019
bfc9ba3
allow MinSessions>MaxSessions if MinSessions not set
olavloite Oct 10, 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
184 changes: 184 additions & 0 deletions ...ib/google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/AbortedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
/*
* Copyright 2019 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.cloud.spanner.jdbc;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;

import com.google.cloud.spanner.MockSpannerServiceImpl;
import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult;
import com.google.cloud.spanner.ResultSet;
import com.google.cloud.spanner.Statement;
import com.google.cloud.spanner.admin.database.v1.MockDatabaseAdminImpl;
import com.google.cloud.spanner.admin.instance.v1.MockInstanceAdminImpl;
import com.google.cloud.spanner.jdbc.ITAbstractSpannerTest.AbortInterceptor;
import com.google.cloud.spanner.jdbc.ITAbstractSpannerTest.ITConnection;
import com.google.cloud.spanner.jdbc.it.ITTransactionRetryTest.CountTransactionRetryListener;
import com.google.protobuf.ListValue;
import com.google.protobuf.Value;
import com.google.spanner.v1.ResultSetMetadata;
import com.google.spanner.v1.StructType;
import com.google.spanner.v1.StructType.Field;
import com.google.spanner.v1.Type;
import com.google.spanner.v1.TypeCode;
import io.grpc.Server;
import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.Arrays;
import java.util.List;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public class AbortedTest {
private static final Statement SELECT_COUNT =
Statement.of("SELECT COUNT(*) AS C FROM TEST WHERE ID=1");
private static final ResultSetMetadata SELECT_COUNT_METADATA =
ResultSetMetadata.newBuilder()
.setRowType(
StructType.newBuilder()
.addFields(
Field.newBuilder()
.setName("C")
.setType(Type.newBuilder().setCode(TypeCode.INT64).build())
.build())
.build())
.build();
private static final com.google.spanner.v1.ResultSet SELECT_COUNT_RESULTSET_BEFORE_INSERT =
com.google.spanner.v1.ResultSet.newBuilder()
.addRows(
ListValue.newBuilder()
.addValues(Value.newBuilder().setStringValue("0").build())
.build())
.setMetadata(SELECT_COUNT_METADATA)
.build();
private static final com.google.spanner.v1.ResultSet SELECT_COUNT_RESULTSET_AFTER_INSERT =
com.google.spanner.v1.ResultSet.newBuilder()
.addRows(
ListValue.newBuilder()
.addValues(Value.newBuilder().setStringValue("1").build())
.build())
.setMetadata(SELECT_COUNT_METADATA)
.build();
private static final Statement INSERT_STATEMENT =
Statement.of("INSERT INTO TEST (ID, NAME) VALUES (1, 'test aborted')");
private static final int UPDATE_COUNT = 1;

private static MockSpannerServiceImpl mockSpanner;
private static MockInstanceAdminImpl mockInstanceAdmin;
private static MockDatabaseAdminImpl mockDatabaseAdmin;
private static Server server;
private static InetSocketAddress address;

@BeforeClass
public static void startStaticServer() throws IOException {
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockInstanceAdmin = new MockInstanceAdminImpl();
mockDatabaseAdmin = new MockDatabaseAdminImpl();
address = new InetSocketAddress("localhost", 0);
server =
NettyServerBuilder.forAddress(address)
.addService(mockSpanner)
.addService(mockInstanceAdmin)
.addService(mockDatabaseAdmin)
.build()
.start();
}

@AfterClass
public static void stopServer() throws Exception {
SpannerPool.closeSpannerPool();
server.shutdown();
server.awaitTermination();
}

public ITConnection createConnection(
AbortInterceptor interceptor, TransactionRetryListener transactionRetryListener) {
return createConnection(
Arrays.<StatementExecutionInterceptor>asList(interceptor),
Arrays.<TransactionRetryListener>asList(transactionRetryListener));
}

public ITConnection createConnection(
List<StatementExecutionInterceptor> interceptors,
List<TransactionRetryListener> transactionRetryListeners) {
StringBuilder url =
new StringBuilder(
String.format(
"cloudspanner://localhost:%d/projects/proj/instances/inst/databases/db?usePlainText=true;autocommit=false;retryAbortsInternally=true",
server.getPort()));
ConnectionOptions.Builder builder =
ConnectionOptions.newBuilder()
.setUri(url.toString())
.setStatementExecutionInterceptors(interceptors);
ConnectionOptions options = builder.build();
ITConnection connection = createITConnection(options);
for (TransactionRetryListener listener : transactionRetryListeners) {
connection.addTransactionRetryListener(listener);
}
return connection;
}

private ITConnection createITConnection(ConnectionOptions options) {
return new ITConnectionImpl(options);
}

@Test
public void testCommitAborted() {
// Do two iterations to ensure that each iteration gets its own transaction, and that each
// transaction is the most recent transaction of that session.
for (int i = 0; i < 2; i++) {
mockSpanner.putStatementResult(
StatementResult.query(SELECT_COUNT, SELECT_COUNT_RESULTSET_BEFORE_INSERT));
mockSpanner.putStatementResult(StatementResult.update(INSERT_STATEMENT, UPDATE_COUNT));
AbortInterceptor interceptor = new AbortInterceptor(0);
try (ITConnection connection =
createConnection(interceptor, new CountTransactionRetryListener())) {
// verify that the there is no test record
try (ResultSet rs =
connection.executeQuery(Statement.of("SELECT COUNT(*) AS C FROM TEST WHERE ID=1"))) {
assertThat(rs.next(), is(true));
assertThat(rs.getLong("C"), is(equalTo(0L)));
assertThat(rs.next(), is(false));
}
// do an insert
connection.executeUpdate(
Statement.of("INSERT INTO TEST (ID, NAME) VALUES (1, 'test aborted')"));
// indicate that the next statement should abort
interceptor.setProbability(1.0);
interceptor.setOnlyInjectOnce(true);
// do a commit that will first abort, and then on retry will succeed
connection.commit();
mockSpanner.putStatementResult(
StatementResult.query(SELECT_COUNT, SELECT_COUNT_RESULTSET_AFTER_INSERT));
// verify that the insert succeeded
try (ResultSet rs =
connection.executeQuery(Statement.of("SELECT COUNT(*) AS C FROM TEST WHERE ID=1"))) {
assertThat(rs.next(), is(true));
assertThat(rs.getLong("C"), is(equalTo(1L)));
assertThat(rs.next(), is(false));
}
}
}
}
}
7 changes: 5 additions & 2 deletions ...cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/ITAbstractSpannerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,11 @@ public void intercept(
Field stateField = cls.getDeclaredField("txnState");
stateField.setAccessible(true);

// first rollback, and then pretend it aborted
tx.rollback();
// First rollback the delegate, and then pretend it aborted.
// We should call rollback on the delegate and not the wrapping
// AutoClosingTransactionManager, as the latter would cause the session to be returned
// to the session pool.
delegate.rollback();
stateField.set(delegate, TransactionState.ABORTED);
} catch (Exception e) {
throw new RuntimeException(e);
Expand Down
20 changes: 10 additions & 10 deletions ...-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/JdbcAbortedTransactionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public void testAutocommitUpdateAborted() throws SQLException {
// These retries are not picked up by the transaction retry listener, as that is only done for
// actual JDBC transactions that are retried.
try (java.sql.Connection connection = createConnection()) {
mockSpanner.abortNextTransaction();
mockSpanner.abortNextStatement();
int updateCount = connection.createStatement().executeUpdate(UPDATE_STATEMENT.getSql());
assertThat(updateCount, is(equalTo(UPDATE_COUNT)));
}
Expand All @@ -188,7 +188,7 @@ public void testTransactionalUpdateAborted() throws SQLException {
}
try (java.sql.Connection connection = createConnection()) {
connection.setAutoCommit(false);
mockSpanner.abortNextTransaction();
mockSpanner.abortNextStatement();
int updateCount = connection.createStatement().executeUpdate(UPDATE_STATEMENT.getSql());
assertThat(updateCount, is(equalTo(UPDATE_COUNT)));
assertThat(getRetryCount(connection), is(equalTo(1)));
Expand All @@ -198,7 +198,7 @@ public void testTransactionalUpdateAborted() throws SQLException {
@Test
public void testAutocommitBatchUpdateAborted() throws SQLException {
try (java.sql.Connection connection = createConnection()) {
mockSpanner.abortNextTransaction();
mockSpanner.abortNextStatement();
try (java.sql.Statement statement = connection.createStatement()) {
statement.addBatch(UPDATE_STATEMENT.getSql());
statement.addBatch(UPDATE_STATEMENT.getSql());
Expand All @@ -215,7 +215,7 @@ public void testTransactionalBatchUpdateAborted() throws SQLException {
}
try (java.sql.Connection connection = createConnection()) {
connection.setAutoCommit(false);
mockSpanner.abortNextTransaction();
mockSpanner.abortNextStatement();
try (java.sql.Statement statement = connection.createStatement()) {
statement.addBatch(UPDATE_STATEMENT.getSql());
statement.addBatch(UPDATE_STATEMENT.getSql());
Expand All @@ -230,7 +230,7 @@ public void testTransactionalBatchUpdateAborted() throws SQLException {
public void testAutocommitSelectAborted() throws SQLException {
// Selects in autocommit are executed using a singleUse read-only transaction and cannot abort.
try (java.sql.Connection connection = createConnection()) {
mockSpanner.abortNextTransaction();
mockSpanner.abortNextStatement();
try (ResultSet rs = connection.createStatement().executeQuery(SELECT1.getSql())) {
while (rs.next()) {
assertThat(rs.getLong(1), is(equalTo(1L)));
Expand All @@ -246,7 +246,7 @@ public void testTransactionalSelectAborted() throws SQLException {
}
try (java.sql.Connection connection = createConnection()) {
connection.setAutoCommit(false);
mockSpanner.abortNextTransaction();
mockSpanner.abortNextStatement();
try (ResultSet rs = connection.createStatement().executeQuery(SELECT1.getSql())) {
while (rs.next()) {
assertThat(rs.getLong(1), is(equalTo(1L)));
Expand Down Expand Up @@ -277,7 +277,7 @@ public void testTransactionalUpdateWithConcurrentModificationsAborted() throws S
mockSpanner.putStatementResult(
StatementResult.query(SELECT_RANDOM, new RandomResultSetGenerator(25).generate()));
// Abort all transactions (including the current one).
mockSpanner.abortAllTransactions();
mockSpanner.abortNextStatement();
// This will abort and start an internal retry.
connection.createStatement().executeUpdate(UPDATE_STATEMENT.getSql());
fail("missing expected aborted exception");
Expand Down Expand Up @@ -307,7 +307,7 @@ public void testTransactionalUpdateWithErrorOnOriginalAndRetry() throws SQLExcep
} catch (SQLException e) {
// ignore
}
mockSpanner.abortAllTransactions();
mockSpanner.abortNextStatement();
connection.commit();
}
}
Expand All @@ -331,7 +331,7 @@ public void testTransactionalUpdateWithErrorOnRetryAndNotOnOriginal() throws SQL
StatementResult.exception(
Statement.of(sql),
Status.INVALID_ARGUMENT.withDescription("test").asRuntimeException()));
mockSpanner.abortAllTransactions();
mockSpanner.abortNextStatement();
connection.commit();
fail("missing expected aborted exception");
} catch (JdbcAbortedDueToConcurrentModificationException e) {
Expand Down Expand Up @@ -369,7 +369,7 @@ public void testTransactionalUpdateWithErrorOnOriginalAndNotOnRetry() throws SQL
}
// Set the update statement to return a result next time (i.e. during retry).
mockSpanner.putStatementResult(StatementResult.update(Statement.of(sql), 1L));
mockSpanner.abortAllTransactions();
mockSpanner.abortNextStatement();
connection.commit();
fail("missing expected aborted exception");
} catch (JdbcAbortedDueToConcurrentModificationException e) {
Expand Down
38 changes: 31 additions & 7 deletions ...google-cloud-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/JdbcDriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;

import com.google.cloud.spanner.MockSpannerServiceImpl;
import io.grpc.Server;
import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public class JdbcDriverTest {
private static final String TEST_KEY_PATH =
ConnectionOptionsTest.class.getResource("test-key.json").getFile();

/**
* Make sure the JDBC driver class is loaded. This is needed when running the test using Maven.
*/
Expand All @@ -43,13 +47,33 @@ public class JdbcDriverTest {
}
}

private static MockSpannerServiceImpl mockSpanner;
private static Server server;
private static InetSocketAddress address;
private static final String TEST_KEY_PATH =
ConnectionOptionsTest.class.getResource("test-key.json").getFile();

@BeforeClass
public static void startStaticServer() throws IOException {
mockSpanner = new MockSpannerServiceImpl();
address = new InetSocketAddress("localhost", 0);
server = NettyServerBuilder.forAddress(address).addService(mockSpanner).build().start();
}

@AfterClass
public static void stopServer() throws Exception {
SpannerPool.closeSpannerPool();
server.shutdown();
server.awaitTermination();
}

@Test
public void testConnect() throws SQLException {
try (Connection connection =
DriverManager.getConnection(
String.format(
"jdbc:cloudspanner:/projects/test-project/instances/static-test-instance/databases/test-database;credentials=%s",
TEST_KEY_PATH))) {
"jdbc:cloudspanner://localhost:%d/projects/test-project/instances/static-test-instance/databases/test-database;usePlainText=true;credentials=%s",
server.getPort(), TEST_KEY_PATH))) {
assertThat(connection.isClosed(), is(false));
}
}
Expand All @@ -59,8 +83,8 @@ public void testInvalidConnect() throws SQLException {
try (Connection connection =
DriverManager.getConnection(
String.format(
"jdbc:cloudspanner:/projects/test-project/instances/static-test-instance/databases/test-database;credentialsUrl=%s",
TEST_KEY_PATH))) {
"jdbc:cloudspanner://localhost:%d/projects/test-project/instances/static-test-instance/databases/test-database;usePlainText=true;credentialsUrl=%s",
server.getPort(), TEST_KEY_PATH))) {
assertThat(connection.isClosed(), is(false));
}
}
Expand Down
Loading