Handle storage connection exceptions correctly

prestodb · Sep 23, 2020 · 1fc69dc · 1fc69dc
1 parent 6bb12b6
commit 1fc69dc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 40 deletions.
diff --git a/presto-common/src/main/java/com/facebook/presto/common/FileSystemCommunicationException.java b/presto-common/src/main/java/com/facebook/presto/common/FileSystemCommunicationException.java
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/HdfsOrcDataSource.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/HdfsOrcDataSource.java
@@ -13,7 +13,6 @@
  */
 package com.facebook.presto.hive.orc;
 
-import com.facebook.presto.common.FileSystemCommunicationException;
 import com.facebook.presto.hive.FileFormatDataSourceStats;
 import com.facebook.presto.orc.AbstractOrcDataSource;
 import com.facebook.presto.orc.OrcDataSourceId;
@@ -23,6 +22,7 @@
 
 import java.io.IOException;
 
+import static com.facebook.presto.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
 import static com.facebook.presto.hive.HiveErrorCode.HIVE_MISSING_DATA;
 import static com.facebook.presto.hive.HiveErrorCode.HIVE_UNKNOWN_ERROR;
 import static java.lang.String.format;
@@ -74,7 +74,7 @@ protected void readInternal(long position, byte[] buffer, int bufferOffset, int
                 throw new PrestoException(HIVE_MISSING_DATA, message, e);
             }
             if (e instanceof IOException) {
-                throw new FileSystemCommunicationException(message, e);
+                throw new PrestoException(HIVE_FILESYSTEM_ERROR, message, e);
             }
             throw new PrestoException(HIVE_UNKNOWN_ERROR, message, e);
         }

diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcSelectivePageSource.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcSelectivePageSource.java
@@ -13,7 +13,6 @@
  */
 package com.facebook.presto.hive.orc;
 
-import com.facebook.presto.common.FileSystemCommunicationException;
 import com.facebook.presto.common.InvalidFunctionArgumentException;
 import com.facebook.presto.common.Page;
 import com.facebook.presto.hive.FileFormatDataSourceStats;
@@ -29,7 +28,6 @@
 
 import static com.facebook.presto.hive.HiveErrorCode.HIVE_BAD_DATA;
 import static com.facebook.presto.hive.HiveErrorCode.HIVE_CURSOR_ERROR;
-import static com.facebook.presto.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
 import static com.facebook.presto.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static java.lang.String.format;
@@ -99,10 +97,6 @@ public Page getNextPage()
             closeWithSuppression(e);
             throw e;
         }
-        catch (FileSystemCommunicationException e) {
-            closeWithSuppression(e);
-            throw new PrestoException(HIVE_FILESYSTEM_ERROR, e);
-        }
         catch (OrcCorruptionException e) {
             closeWithSuppression(e);
             throw new PrestoException(HIVE_BAD_DATA, e);

diff --git a/...o-orc/src/main/java/com/facebook/presto/orc/metadata/ExceptionWrappingMetadataReader.java b/...o-orc/src/main/java/com/facebook/presto/orc/metadata/ExceptionWrappingMetadataReader.java
@@ -13,7 +13,6 @@
  */
 package com.facebook.presto.orc.metadata;
 
-import com.facebook.presto.common.FileSystemCommunicationException;
 import com.facebook.presto.orc.OrcCorruptionException;
 import com.facebook.presto.orc.OrcDataSourceId;
 import com.facebook.presto.orc.metadata.PostScript.HiveWriterVersion;
@@ -24,7 +23,6 @@
 import java.util.List;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Throwables.propagateIfPossible;
 import static java.util.Objects.requireNonNull;
 
 public class ExceptionWrappingMetadataReader
@@ -114,7 +112,9 @@ public List<HiveBloomFilter> readBloomFilterIndexes(InputStream inputStream)
 
     private OrcCorruptionException propagate(Throwable throwable, String message)
     {
-        propagateIfPossible(throwable, FileSystemCommunicationException.class);
+        if (throwable.getClass().getSimpleName().equals("PrestoException")) {
+            throw (RuntimeException) throwable;
+        }
         return new OrcCorruptionException(throwable, orcDataSourceId, message);
     }
 }