Don't retry table metadata read when cause is FileNotFoundException

trinodb · Apr 11, 2023 · 20841a6 · 20841a6
1 parent f520212
commit 20841a6
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractIcebergTableOperations.java b/...iceberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractIcebergTableOperations.java
@@ -31,6 +31,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
+import java.io.FileNotFoundException;
 import java.time.Duration;
 import java.util.List;
 import java.util.Objects;
@@ -230,8 +231,8 @@ protected void refreshFromMetadataLocation(String newLocation)
                         .withMaxRetries(20)
                         .withBackoff(100, 5000, MILLIS, 4.0)
                         .withMaxDuration(Duration.ofMinutes(10))
-                        .abortOn(org.apache.iceberg.exceptions.NotFoundException.class)
-                        .build()) // qualified name, as this is NOT the io.trino.spi.connector.NotFoundException
+                        .abortOn(AbstractIcebergTableOperations::isNotFoundException)
+                        .build())
                 .get(() -> TableMetadataParser.read(fileIo, io().newInputFile(newLocation)));
 
         String newUUID = newMetadata.uuid();
@@ -246,6 +247,14 @@ protected void refreshFromMetadataLocation(String newLocation)
         shouldRefresh = false;
     }
 
+    private static boolean isNotFoundException(Throwable failure)
+    {
+        // qualified name, as this is NOT the io.trino.spi.connector.NotFoundException
+        return failure instanceof org.apache.iceberg.exceptions.NotFoundException ||
+                // This is used in context where the code cannot throw a checked exception, so FileNotFoundException would need to be wrapped
+                failure.getCause() instanceof FileNotFoundException;
+    }
+
     protected static String newTableMetadataFilePath(TableMetadata meta, int newVersion)
     {
         String codec = meta.property(METADATA_COMPRESSION, METADATA_COMPRESSION_DEFAULT);