Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 763b9e598 -> cffbda47d
PHOENIX-4653 Upgrading from namespace enabled cluster to latest version failing with UpgradeInProgressException(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cffbda47 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cffbda47 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cffbda47 Branch: refs/heads/5.x-HBase-2.0 Commit: cffbda47df5bff5ebc1e59ce6c37391e4a00248d Parents: 763b9e5 Author: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Authored: Wed Apr 11 17:45:44 2018 +0530 Committer: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Committed: Wed Apr 11 17:45:44 2018 +0530 ---------------------------------------------------------------------- .../apache/phoenix/query/ConnectionQueryServicesImpl.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/cffbda47/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 4b04e74..138bf7c 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 @@ -2709,12 +2709,8 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement sysCatalogTableName = e.getTable().getPhysicalName().getString(); if (currentServerSideTableTimeStamp < MIN_SYSTEM_TABLE_TIMESTAMP) { // Ensure that the SYSTEM.MUTEX table has been created prior - // to attempting to acquire the upgrade mutex. If namespace - // mapping is enabled, we've already done this earlier in the - // upgrade, so no need for a bunch of wasted RPCs. - if (currentServerSideTableTimeStamp <= MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_10_0 && - !SchemaUtil.isNamespaceMappingEnabled(PTableType.SYSTEM, - ConnectionQueryServicesImpl.this.getProps())) { + // to attempting to acquire the upgrade mutex. + if (currentServerSideTableTimeStamp <= MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_10_0) { try (Admin admin = getAdmin()) { createSysMutexTableIfNotExists(admin, this.getProps()); }
