PHOENIX-4399 Remove explicit abort on RegionServerServices (addendum)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b78f45c0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b78f45c0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b78f45c0 Branch: refs/heads/master Commit: b78f45c03ed014297fe848b106da86e58f4aa3e0 Parents: aa2f12d Author: Ankit Singhal <ankitsingha...@gmail.com> Authored: Fri Jun 22 15:58:09 2018 -0700 Committer: Ankit Singhal <ankitsingha...@gmail.com> Committed: Fri Jun 22 15:58:09 2018 -0700 ---------------------------------------------------------------------- .../org/apache/phoenix/hbase/index/util/IndexManagementUtil.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b78f45c0/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/IndexManagementUtil.java ---------------------------------------------------------------------- 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 index 2d65747..6c7966f 100644 --- 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.Put; 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 class IndexManagementUtil { 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); }
