Skip to content

Retry catalogCleanup on ForbiddenException in IcebergCatalogBaseIT #41235

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

Draft
damccorm wants to merge 2 commits into
base: master
Choose a base branch
from
+21 −5
Draft

Retry catalogCleanup on ForbiddenException in IcebergCatalogBaseIT #41235

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e0216c
Retry catalogCleanup on ForbiddenException in BigQueryMetastoreCatalogIT
damccorm Nov 12, 2026
7039747
Move catalogCleanup ForbiddenException retry into IcebergCatalogBaseIT
damccorm Nov 13, 2026
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
26 changes: 21 additions & 5 deletions ...io/iceberg/src/test/java/org/apache/beam/sdk/io/iceberg/catalog/IcebergCatalogBaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
import org.apache.iceberg.deletes.PositionDeleteWriter;
import org.apache.iceberg.encryption.EncryptedFiles;
import org.apache.iceberg.encryption.InputFilesDecryptor;
import org.apache.iceberg.exceptions.ForbiddenException;
import org.apache.iceberg.io.CloseableIterable;
import org.apache.iceberg.io.DataWriter;
import org.apache.iceberg.io.FileIO;
Expand Down Expand Up @@ -188,11 +189,26 @@ public void catalogSetup() {

public void catalogCleanup(List<Namespace> namespaces) throws IOException {
for (Namespace namespace : namespaces) {
for (TableIdentifier identifier : catalog.listTables(namespace)) {
catalog.dropTable(identifier);
}
if (catalog instanceof SupportsNamespaces) {
((SupportsNamespaces) catalog).dropNamespace(namespace);
for (int attempt = 1; attempt <= 3; attempt++) {
try {
for (TableIdentifier identifier : catalog.listTables(namespace)) {
catalog.dropTable(identifier);
}
if (catalog instanceof SupportsNamespaces) {
((SupportsNamespaces) catalog).dropNamespace(namespace);
}
break;
} catch (ForbiddenException e) {
if (attempt == 3) {
throw e;
}
try {
Thread.sleep(SETUP_TEARDOWN_SLEEP_MS * attempt);
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
throw new IOException("Interrupted while waiting to retry catalog cleanup", ie);
}
}
}
}
}
Expand Down
Loading