PHOENIX-4399 Remove explicit abort on RegionServerServices (addendum)

zzzppi · Jun 22, 2018 · b78f45c · b78f45c
1 parent aa2f12d
commit b78f45c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/IndexManagementUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/IndexManagementUtil.java
@@ -40,6 +40,7 @@
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.regionserver.wal.WALCellCodec;
 import org.apache.phoenix.hbase.index.ValueGetter;
+import org.apache.phoenix.hbase.index.builder.FatalIndexBuildingFailureException;
 import org.apache.phoenix.hbase.index.builder.IndexBuildingFailureException;
 import org.apache.phoenix.hbase.index.covered.Batch;
 import org.apache.phoenix.hbase.index.covered.data.LazyValueGetter;
@@ -200,6 +201,7 @@ public static void rethrowIndexingException(Throwable e) throws IOException {
             LOG.info("Rethrowing " + e);
             throw e1;
         } catch (Throwable e1) {
+            if (e1 instanceof FatalIndexBuildingFailureException) { throw (FatalIndexBuildingFailureException)e1; }
             LOG.info("Rethrowing " + e1 + " as a " + IndexBuildingFailureException.class.getSimpleName());
             throw new IndexBuildingFailureException("Failed to build index for unexpected reason!", e1);
         }