[08/21] phoenix git commit: PHOENIX-4653 Upgrading from namespace enabled cluster to latest version failing with UpgradeInProgressException(Rajeshbabu)

2018-04-14 Thread pboado 
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/08564a99
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/08564a99
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/08564a99

Branch: refs/heads/4.x-cdh5.14
Commit: 08564a99e4ea5c89441a55fe96a54122cc4a46c8
Parents: fe06c3b
Author: Rajeshbabu Chintaguntla 
Authored: Wed Apr 11 13:48:04 2018 +0100
Committer: Pedro Boado 
Committed: Fri Apr 13 23:27:12 2018 +0100

--
 .../apache/phoenix/query/ConnectionQueryServicesImpl.java| 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/08564a99/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());
 }

[08/21] phoenix git commit: PHOENIX-4653 Upgrading from namespace enabled cluster to latest version failing with UpgradeInProgressException(Rajeshbabu)

2018-04-14 Thread pboado 
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/08564a99
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/08564a99
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/08564a99

Branch: refs/heads/4.x-cdh5.13
Commit: 08564a99e4ea5c89441a55fe96a54122cc4a46c8
Parents: fe06c3b
Author: Rajeshbabu Chintaguntla 
Authored: Wed Apr 11 13:48:04 2018 +0100
Committer: Pedro Boado 
Committed: Fri Apr 13 23:27:12 2018 +0100

--
 .../apache/phoenix/query/ConnectionQueryServicesImpl.java| 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/08564a99/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());
 }

[08/21] phoenix git commit: PHOENIX-4653 Upgrading from namespace enabled cluster to latest version failing with UpgradeInProgressException(Rajeshbabu)

2018-04-14 Thread pboado 
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/08564a99
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/08564a99
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/08564a99

Branch: refs/heads/4.x-cdh5.12
Commit: 08564a99e4ea5c89441a55fe96a54122cc4a46c8
Parents: fe06c3b
Author: Rajeshbabu Chintaguntla 
Authored: Wed Apr 11 13:48:04 2018 +0100
Committer: Pedro Boado 
Committed: Fri Apr 13 23:27:12 2018 +0100

--
 .../apache/phoenix/query/ConnectionQueryServicesImpl.java| 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/08564a99/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());
 }