Skip to content

fix: always delete all backups from an owned test instance #557

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
thiagotnunes merged 2 commits into from
Oct 27, 2020
Merged

fix: always delete all backups from an owned test instance #557

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d10a107
fix: always delete all backups from an owned test instance
olavloite Oct 27, 2020
5cf721e
fix: do not try to list backups on emulator
olavloite Oct 27, 2020
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
15 changes: 15 additions & 0 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 @@ -19,6 +19,7 @@
import static com.google.common.base.Preconditions.checkState;

import com.google.api.gax.longrunning.OperationFuture;
import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
import com.google.cloud.spanner.testing.RemoteSpannerHelper;
import com.google.common.collect.Iterators;
import com.google.spanner.admin.instance.v1.CreateInstanceMetadata;
Expand Down Expand Up @@ -165,6 +166,20 @@ private void cleanUpInstance() {
if (isOwnedInstance) {
// Delete the instance, which implicitly drops all databases in it.
try {
if (!EmulatorSpannerHelper.isUsingEmulator()) {
// Backups must be explicitly deleted before the instance may be deleted.
logger.log(
Level.FINE, "Deleting backups on test instance {0}", testHelper.getInstanceId());
for (Backup backup :
testHelper
.getClient()
.getDatabaseAdminClient()
.listBackups(testHelper.getInstanceId().getInstance())
.iterateAll()) {
logger.log(Level.FINE, "Deleting backup {0}", backup.getId());
backup.delete();
}
}
logger.log(Level.FINE, "Deleting test instance {0}", testHelper.getInstanceId());
instanceAdminClient.deleteInstance(testHelper.getInstanceId().getInstance());
logger.log(Level.INFO, "Deleted test instance {0}", testHelper.getInstanceId());
Expand Down