Repository: phoenix Updated Branches: refs/heads/4.8-HBase-1.2 9b313cbd2 -> fa9c74b42
PHOENIX-3481 Phoenix initialization fails for HBase 0.98.21 and beyond Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fa9c74b4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fa9c74b4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fa9c74b4 Branch: refs/heads/4.8-HBase-1.2 Commit: fa9c74b42be2bd032053417e4216334e568a4a8c Parents: 9b313cb Author: Samarth <[email protected]> Authored: Tue Nov 15 11:29:13 2016 -0800 Committer: Samarth <[email protected]> Committed: Tue Nov 15 11:29:13 2016 -0800 ---------------------------------------------------------------------- .../apache/phoenix/query/ConnectionQueryServicesImpl.java | 9 +-------- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 5 +++++ 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fa9c74b4/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java index 2df7b47..d6635dc 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java @@ -1062,14 +1062,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement * brought down. */ newDesc.setValue(HTableDescriptor.SPLIT_POLICY, MetaDataSplitPolicy.class.getName()); - if (allowOnlineTableSchemaUpdate()) { - // No need to wait/poll for this update - admin.modifyTable(physicalTable, newDesc); - } else { - admin.disableTable(physicalTable); - admin.modifyTable(physicalTable, newDesc); - admin.enableTable(physicalTable); - } + modifyTable(tableName, newDesc, true); } return null; } else { http://git-wip-us.apache.org/repos/asf/phoenix/blob/fa9c74b4/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 679c7a1..a3940fc 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -25,6 +25,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.hadoop.hbase.DoNotRetryIOException; +import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.HTablePool; @@ -34,6 +35,7 @@ import org.apache.phoenix.exception.PhoenixIOException; import org.apache.phoenix.exception.SQLExceptionCode; import org.apache.phoenix.exception.SQLExceptionInfo; import org.apache.phoenix.hbase.index.util.VersionUtil; +import org.apache.phoenix.schema.StaleRegionBoundaryCacheException; @SuppressWarnings("deprecation") @@ -113,6 +115,9 @@ public class ServerUtil { public static SQLException parseServerExceptionOrNull(Throwable t) { while (t.getCause() != null) { + if (t instanceof NotServingRegionException) { + return parseRemoteException(new StaleRegionBoundaryCacheException()); + } t = t.getCause(); } return parseRemoteException(t);
