fix: Clean up snapshots when cross region database replication fails (#…

…143)
Nike-Inc · Feb 10, 2020 · a4f3d7a · a4f3d7a
1 parent 4bf4036
commit a4f3d7a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -16,4 +16,4 @@
 
 group=com.nike
 artifactId=cerberus-lifecycle-cli
-version=4.12.0
+version=4.12.1
diff --git a/src/main/java/com/nike/cerberus/operation/rds/XRegionDatabaseReplicationOperation.java b/src/main/java/com/nike/cerberus/operation/rds/XRegionDatabaseReplicationOperation.java
@@ -84,10 +84,13 @@ public void run(XRegionDatabaseReplicationCommand command) {
 
         log.info("Preparing to initiate copy of RDS DB snapshot: {} located in region: {} to region: {}",
                     sourceSnapshot.getDBClusterSnapshotIdentifier(), sourceRegion.getName(), targetRegion.getName());
-        DBClusterSnapshot copiedSnapshot = rdsService.copySnapshot(sourceSnapshot, sourceRegion, targetRegion);
-        rdsService.waitForSnapshotsToBecomeAvailable(copiedSnapshot, targetRegion);
-
-        rdsService.deleteSnapshot(sourceSnapshot, sourceRegion);
+        DBClusterSnapshot copiedSnapshot;
+        try {
+            copiedSnapshot = rdsService.copySnapshot(sourceSnapshot, sourceRegion, targetRegion);
+            rdsService.waitForSnapshotsToBecomeAvailable(copiedSnapshot, targetRegion);
+        } finally {
+            rdsService.deleteSnapshot(sourceSnapshot, sourceRegion);
+        }
 
         String databasePassword = configStore.getCmsDatabasePassword()
                 .orElseThrow(() -> new RuntimeException("Expected the database password to exist"));
@@ -117,9 +120,9 @@ public void run(XRegionDatabaseReplicationCommand command) {
             } else {
                 throw ase;
             }
+        } finally {
+            rdsService.deleteSnapshot(copiedSnapshot, targetRegion);
         }
-
-        rdsService.deleteSnapshot(copiedSnapshot, targetRegion);
     }