@@ -61,30 +61,26 @@ public static void beforeClass() {
|
61 | 61 | @AfterClass
|
62 | 62 | public static void afterClass() {
|
63 | 63 | for (String databaseId : idGenerator.getDatabaseIds()) {
|
| 64 | +System.out.println("Trying to drop " + databaseId); |
64 | 65 | try {
|
| 66 | +// If the database is not found, it is ignored (no exception is thrown) |
65 | 67 | databaseAdminClient.dropDatabase(instanceId, databaseId);
|
66 |
| -} catch (Exception e1) { |
67 |
| -try { |
68 |
| -databaseAdminClient.dropDatabase(multiRegionalInstanceId, databaseId); |
69 |
| -} catch (Exception e2) { |
70 |
| -System.out.println( |
71 |
| -"Failed to drop database " + databaseId + " due to " + e2.getMessage() |
72 |
| -+ ", skipping..." |
73 |
| -); |
74 |
| -} |
| 68 | +databaseAdminClient.dropDatabase(multiRegionalInstanceId, databaseId); |
| 69 | +} catch (Exception e) { |
| 70 | +System.out.println( |
| 71 | +"Failed to drop database " + databaseId + " due to " + e.getMessage() + ", skipping..." |
| 72 | +); |
75 | 73 | }
|
76 | 74 | }
|
77 | 75 | for (String backupId : idGenerator.getBackupIds()) {
|
78 | 76 | try {
|
| 77 | +// If the backup is not found, it is ignored (no exception is thrown) |
79 | 78 | databaseAdminClient.deleteBackup(instanceId, backupId);
|
80 |
| -} catch (Exception e1) { |
81 |
| -try { |
82 |
| -databaseAdminClient.deleteBackup(multiRegionalInstanceId, backupId); |
83 |
| -} catch (Exception e2) { |
84 |
| -System.out.println( |
85 |
| -"Failed to delete backup " + backupId + " due to " + e2.getMessage() + ", skipping..." |
86 |
| -); |
87 |
| -} |
| 79 | +databaseAdminClient.deleteBackup(multiRegionalInstanceId, backupId); |
| 80 | +} catch (Exception e) { |
| 81 | +System.out.println( |
| 82 | +"Failed to delete backup " + backupId + " due to " + e.getMessage() + ", skipping..." |
| 83 | +); |
88 | 84 | }
|
89 | 85 | }
|
90 | 86 | spanner.close();
|
|
0 commit comments