You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2015/12/01 07:33:13 UTC
phoenix git commit: PHOENIX-2461 Reverting Tweak shutdown of
ConnectionQueryService during testing
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 1928b8fc4 -> c2da070f1
PHOENIX-2461 Reverting Tweak shutdown of ConnectionQueryService during testing
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c2da070f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c2da070f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c2da070f
Branch: refs/heads/4.x-HBase-0.98
Commit: c2da070f15aab77dfccdf5acbb890a28049e99b6
Parents: 1928b8f
Author: James Taylor <jt...@salesforce.com>
Authored: Mon Nov 30 11:58:21 2015 -0800
Committer: James Taylor <jt...@salesforce.com>
Committed: Mon Nov 30 22:30:22 2015 -0800
----------------------------------------------------------------------
.../phoenix/end2end/ConnectionQueryServicesTestImpl.java | 9 +--------
.../apache/phoenix/query/ConnectionQueryServicesImpl.java | 3 +--
2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2da070f/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
index 63dfaf9..2028223 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
@@ -63,14 +63,7 @@ public class ConnectionQueryServicesTestImpl extends ConnectionQueryServicesImpl
try {
clearCache();
} finally {
- try {
- // Since ConnectionQueryServicesTestImpl is a singleton
- // during testing, attempt to stop the Zookeeper client
- // service when the driver is closed.
- if (zkClientService != null) zkClientService.stopAndWait();
- } finally {
- super.close();
- }
+ super.close();
}
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2da070f/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 45ecf80..c564524 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
@@ -219,7 +219,6 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
private HConnection connection;
private TransactionServiceClient txServiceClient;
- protected volatile ZKClientService zkClientService;
private volatile boolean initialized;
private volatile int nSequenceSaltBuckets;
@@ -305,7 +304,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
private void initTxServiceClient() {
String zkQuorumServersString = connectionInfo.getZookeeperQuorum()+":"+connectionInfo.getPort();
- zkClientService = ZKClientServices.delegate(
+ ZKClientService zkClientService = ZKClientServices.delegate(
ZKClients.reWatchOnExpire(
ZKClients.retryOnFailure(
ZKClientService.Builder.of(zkQuorumServersString)