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 2016/02/19 23:33:47 UTC
phoenix git commit: PHOENIX-2670 Guava version incompatibility of
Twill vs HBase when launching M/R index
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 072657081 -> 5a5bccdd1
PHOENIX-2670 Guava version incompatibility of Twill vs HBase when launching M/R index
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5a5bccdd
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5a5bccdd
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5a5bccdd
Branch: refs/heads/4.x-HBase-0.98
Commit: 5a5bccdd18354f9f8f544175ed112a1502d90e7a
Parents: 0726570
Author: James Taylor <ja...@apache.org>
Authored: Fri Feb 19 14:33:27 2016 -0800
Committer: James Taylor <ja...@apache.org>
Committed: Fri Feb 19 14:33:27 2016 -0800
----------------------------------------------------------------------
.../phoenix/query/ConnectionQueryServicesImpl.java | 14 ++++++++------
pom.xml | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/5a5bccdd/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 f7a72a0..ffcbd0f 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
@@ -194,6 +194,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Throwables;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -205,6 +206,7 @@ import co.cask.tephra.TransactionSystemClient;
import co.cask.tephra.TxConstants;
import co.cask.tephra.distributed.PooledClientProvider;
import co.cask.tephra.distributed.TransactionServiceClient;
+import co.cask.tephra.zookeeper.TephraZKClientService;
public class ConnectionQueryServicesImpl extends DelegateQueryServices implements ConnectionQueryServices {
@@ -350,14 +352,14 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
if (zkQuorumServersString==null) {
zkQuorumServersString = connectionInfo.getZookeeperQuorum()+":"+connectionInfo.getPort();
}
+
+ int timeOut = props.getInt(HConstants.ZK_SESSION_TIMEOUT, HConstants.DEFAULT_ZK_SESSION_TIMEOUT);
+ // Create instance of the tephra zookeeper client
+ ZKClientService tephraZKClientService = new TephraZKClientService(zkQuorumServersString, timeOut, null, ArrayListMultimap.<String, byte[]>create());
+
ZKClientService zkClientService = ZKClientServices.delegate(
ZKClients.reWatchOnExpire(
- ZKClients.retryOnFailure(
- ZKClientService.Builder.of(zkQuorumServersString)
- .setSessionTimeout(props.getInt(HConstants.ZK_SESSION_TIMEOUT, HConstants.DEFAULT_ZK_SESSION_TIMEOUT))
- .build(),
- RetryStrategies.exponentialDelay(500, 2000, TimeUnit.MILLISECONDS)
- )
+ ZKClients.retryOnFailure(tephraZKClientService, RetryStrategies.exponentialDelay(500, 2000, TimeUnit.MILLISECONDS))
)
);
zkClientService.startAndWait();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/5a5bccdd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8972ab7..33145d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
<joni.version>2.1.2</joni.version>
<calcite.version>1.6.0</calcite.version>
<jettyVersion>8.1.7.v20120910</jettyVersion>
- <tephra.version>0.6.5</tephra.version>
+ <tephra.version>0.7.0</tephra.version>
<spark.version>1.5.2</spark.version>
<scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version>