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/e40d9201 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e40d9201 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e40d9201 Branch: refs/heads/system-catalog Commit: e40d920160ce95e2cbb75642100aa01a1af6fdd9 Parents: d48518b Author: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Authored: Wed Apr 11 18:16:45 2018 +0530 Committer: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Committed: Wed Apr 11 18:16:45 2018 +0530 ---------------------------------------------------------------------- .../apache/phoenix/query/ConnectionQueryServicesImpl.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e40d9201/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 8c7441a..6627a84 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 @@ -2678,13 +2678,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement long currentServerSideTableTimeStamp = e.getTable().getTimeStamp(); 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())) { + if (currentServerSideTableTimeStamp <= MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_10_0) { try (HBaseAdmin admin = getAdmin()) { createSysMutexTableIfNotExists(admin, this.getProps()); }
