Skip to content

test: wait and retry after RESOURCE_EXHAUSTED in tests #4159

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
merged 1 commit into from
Oct 9, 2025
Merged

test: wait and retry after RESOURCE_EXHAUSTED in tests #4159

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
51 changes: 35 additions & 16 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,25 +298,44 @@ private void cleanUpOldDatabases(InstanceId instanceId) {
String TEST_DB_REGEX = "(testdb_(.*)_(.*))|(mysample-(.*))";

logger.log(Level.INFO, "Dropping old test databases from {0}", instanceId.getName());
for (Database db : databaseAdminClient.listDatabases(instanceId.getInstance()).iterateAll()) {
while (true) {
try {
long timeDiff = currentTimestamp.getSeconds() - db.getCreateTime().getSeconds();
// Delete all databases which are more than OLD_DB_THRESHOLD_SECS seconds old.
if ((db.getId().getDatabase().matches(TEST_DB_REGEX))
&& (timeDiff > OLD_DB_THRESHOLD_SECS)) {
logger.log(Level.INFO, "Dropping test database {0}", db.getId());
if (db.isDropProtectionEnabled()) {
Database updatedDatabase =
databaseAdminClient.newDatabaseBuilder(db.getId()).disableDropProtection().build();
databaseAdminClient
.updateDatabase(updatedDatabase, DatabaseField.DROP_PROTECTION)
.get();
for (Database db :
databaseAdminClient.listDatabases(instanceId.getInstance()).iterateAll()) {
try {
long timeDiff = currentTimestamp.getSeconds() - db.getCreateTime().getSeconds();
// Delete all databases which are more than OLD_DB_THRESHOLD_SECS seconds old.
if ((db.getId().getDatabase().matches(TEST_DB_REGEX))
&& (timeDiff > OLD_DB_THRESHOLD_SECS)) {
logger.log(Level.INFO, "Dropping test database {0}", db.getId());
if (db.isDropProtectionEnabled()) {
Database updatedDatabase =
databaseAdminClient
.newDatabaseBuilder(db.getId())
.disableDropProtection()
.build();
databaseAdminClient
.updateDatabase(updatedDatabase, DatabaseField.DROP_PROTECTION)
.get();
}
db.drop();
++numDropped;
}
} catch (SpannerException | ExecutionException | InterruptedException e) {
logger.log(Level.SEVERE, "Failed to drop test database " + db.getId(), e);
}
db.drop();
++numDropped;
}
} catch (SpannerException | ExecutionException | InterruptedException e) {
logger.log(Level.SEVERE, "Failed to drop test database " + db.getId(), e);
break;
} catch (SpannerException exception) {
if (exception.getErrorCode() != ErrorCode.RESOURCE_EXHAUSTED) {
throw exception;
}
// Wait a little and try again.
try {
Thread.sleep(10_000);
} catch (InterruptedException interruptedException) {
throw SpannerExceptionFactory.propagateInterrupt(interruptedException);
}
}
}
logger.log(Level.INFO, "Dropped {0} test database(s)", numDropped);
Expand Down