Skip to content

Commit e3257e8

Browse files
authored
test: reduce administrative calls in samples (#717)
1 parent f14f7c9 commit e3257e8

File tree

5 files changed

+23
-11
lines changed

5 files changed

+23
-11
lines changed

samples/snippets/src/main/java/com/example/spanner/SpannerSample.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,12 +1671,16 @@ static void cancelCreateBackup(
16711671
static void listBackupOperations(InstanceAdminClient instanceAdminClient, DatabaseId databaseId) {
16721672
Instance instance = instanceAdminClient.getInstance(databaseId.getInstanceId().getInstance());
16731673
// Get create backup operations for the sample database.
1674+
Timestamp last24Hours = Timestamp.ofTimeSecondsAndNanos(TimeUnit.SECONDS.convert(
1675+
TimeUnit.HOURS.convert(Timestamp.now().getSeconds(), TimeUnit.SECONDS) - 24,
1676+
TimeUnit.HOURS), 0);
16741677
String filter =
16751678
String.format(
16761679
"(metadata.database:%s) AND "
16771680
+ "(metadata.@type:type.googleapis.com/"
1678-
+ "google.spanner.admin.database.v1.CreateBackupMetadata)",
1679-
databaseId.getName());
1681+
+ "google.spanner.admin.database.v1.CreateBackupMetadata) AND "
1682+
+ "(metadata.progress.start_time > \"%s\")",
1683+
databaseId.getName(), last24Hours);
16801684
Page<Operation> operations = instance.listBackupOperations(Options.filter(filter));
16811685
for (Operation op : operations.iterateAll()) {
16821686
try {
@@ -1702,8 +1706,12 @@ static void listDatabaseOperations(
17021706
InstanceId instanceId) {
17031707
Instance instance = instanceAdminClient.getInstance(instanceId.getInstance());
17041708
// Get optimize restored database operations.
1705-
String filter = "(metadata.@type:type.googleapis.com/"
1706-
+ "google.spanner.admin.database.v1.OptimizeRestoredDatabaseMetadata)";
1709+
Timestamp last24Hours = Timestamp.ofTimeSecondsAndNanos(TimeUnit.SECONDS.convert(
1710+
TimeUnit.HOURS.convert(Timestamp.now().getSeconds(), TimeUnit.SECONDS) - 24,
1711+
TimeUnit.HOURS), 0);
1712+
String filter = String.format("(metadata.@type:type.googleapis.com/"
1713+
+ "google.spanner.admin.database.v1.OptimizeRestoredDatabaseMetadata) AND "
1714+
+ "(metadata.progress.start_time > \"%s\")", last24Hours);
17071715
for (Operation op : instance.listDatabaseOperations(Options.filter(filter)).iterateAll()) {
17081716
try {
17091717
OptimizeRestoredDatabaseMetadata metadata =

samples/snippets/src/test/java/com/example/spanner/AsyncExamplesIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ private String runExample(AsyncRunnable example)
7272

7373
@BeforeClass
7474
public static void createTestDatabase() throws Exception {
75-
SpannerOptions options = SpannerOptions.newBuilder().build();
75+
SpannerOptions options =
76+
SpannerOptions.newBuilder().setAutoThrottleAdministrativeRequests().build();
7677
spanner = options.getService();
7778
dbClient = spanner.getDatabaseAdminClient();
7879
if (instanceId == null) {

samples/snippets/src/test/java/com/example/spanner/QuickstartSampleIT.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919
import static com.google.common.truth.Truth.assertThat;
2020

2121
import com.google.cloud.spanner.DatabaseAdminClient;
22-
import com.google.cloud.spanner.DatabaseNotFoundException;
2322
import com.google.cloud.spanner.Spanner;
2423
import com.google.cloud.spanner.SpannerOptions;
2524
import java.io.ByteArrayOutputStream;
2625
import java.io.PrintStream;
27-
import java.util.Arrays;
2826
import java.util.Collections;
2927
import java.util.UUID;
3028
import org.junit.After;
@@ -43,6 +41,7 @@
4341
public class QuickstartSampleIT {
4442
private static String instanceId = System.getProperty("spanner.test.instance");
4543
private static String dbId = formatForTest(System.getProperty("spanner.quickstart.database"));
44+
private static Spanner spanner;
4645
private static DatabaseAdminClient dbClient;
4746

4847
private ByteArrayOutputStream bout;
@@ -51,15 +50,17 @@ public class QuickstartSampleIT {
5150

5251
@BeforeClass
5352
public static void createDatabase() {
54-
final SpannerOptions options = SpannerOptions.newBuilder().build();
55-
final Spanner spanner = options.getService();
53+
final SpannerOptions options =
54+
SpannerOptions.newBuilder().setAutoThrottleAdministrativeRequests().build();
55+
spanner = options.getService();
5656
dbClient = spanner.getDatabaseAdminClient();
5757
dbClient.createDatabase(instanceId, dbId, Collections.emptyList());
5858
}
5959

6060
@AfterClass
6161
public static void dropDatabase() {
6262
dbClient.dropDatabase(instanceId, dbId);
63+
spanner.close();
6364
}
6465

6566
@Before

samples/snippets/src/test/java/com/example/spanner/SpannerSampleIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ private String runSample(String command) throws Exception {
6868

6969
@BeforeClass
7070
public static void setUp() throws Exception {
71-
SpannerOptions options = SpannerOptions.newBuilder().build();
71+
SpannerOptions options =
72+
SpannerOptions.newBuilder().setAutoThrottleAdministrativeRequests().build();
7273
spanner = options.getService();
7374
dbClient = spanner.getDatabaseAdminClient();
7475
dbId = DatabaseId.of(options.getProjectId(), instanceId, databaseId);

samples/snippets/src/test/java/com/example/spanner/SpannerStandaloneExamplesIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ private String runExample(Runnable example) {
6666

6767
@BeforeClass
6868
public static void createTestDatabase() throws Exception {
69-
SpannerOptions options = SpannerOptions.newBuilder().build();
69+
SpannerOptions options =
70+
SpannerOptions.newBuilder().setAutoThrottleAdministrativeRequests().build();
7071
spanner = options.getService();
7172
dbClient = spanner.getDatabaseAdminClient();
7273
if (instanceId == null) {

0 commit comments

Comments
 (0)