Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 a9c38bcd2 -> 25ef48b98


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/25ef48b9
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/25ef48b9
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/25ef48b9

Branch: refs/heads/4.x-HBase-1.3
Commit: 25ef48b98a549e78e775b682e80376f542b8998a
Parents: a9c38bc
Author: Rajeshbabu Chintaguntla <rajeshb...@apache.org>
Authored: Wed Apr 11 18:17:31 2018 +0530
Committer: Rajeshbabu Chintaguntla <rajeshb...@apache.org>
Committed: Wed Apr 11 18:17:31 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/25ef48b9/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());
                         }

Reply via email to