You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by fp...@apache.org on 2016/05/11 18:06:12 UTC
[05/50] [abbrv] incubator-omid git commit: Use IOException in
TransactionException and ZKUtils.initZKClient()
Use IOException in TransactionException and ZKUtils.initZKClient()
Change-Id: I309f03ccc003fc42203f5581641fc0b69c46a4f9
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/83c252b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/83c252b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/83c252b4
Branch: refs/heads/master
Commit: 83c252b463128847c4f3b93a655f979fec0ce490
Parents: 3072f32
Author: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Authored: Thu Apr 21 16:02:36 2016 -0700
Committer: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Committed: Thu Apr 21 16:02:36 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/omid/zk/ZKUtils.java | 17 ++++++++++++-----
.../apache/omid/examples/ConfigurationExample.java | 3 +--
.../transaction/TestEndToEndScenariosWithHA.java | 2 +-
.../apache/omid/transaction/TestTxMgrFailover.java | 2 +-
.../apache/omid/timestamp/storage/ZKModule.java | 2 +-
.../omid/transaction/TransactionException.java | 5 ++++-
.../java/org/apache/omid/tso/client/TSOClient.java | 5 ++---
7 files changed, 22 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/83c252b4/common/src/main/java/org/apache/omid/zk/ZKUtils.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/omid/zk/ZKUtils.java b/common/src/main/java/org/apache/omid/zk/ZKUtils.java
index 275e3b7..9e3d3b4 100644
--- a/common/src/main/java/org/apache/omid/zk/ZKUtils.java
+++ b/common/src/main/java/org/apache/omid/zk/ZKUtils.java
@@ -32,7 +32,7 @@ public class ZKUtils {
private static final Logger LOG = LoggerFactory.getLogger(ZKUtils.class);
public static CuratorFramework initZKClient(String zkCluster, String namespace, int zkConnectionTimeoutInSec)
- throws IOException, InterruptedException {
+ throws IOException {
LOG.info("Creating Zookeeper Client connecting to {}", zkCluster);
@@ -44,10 +44,17 @@ public class ZKUtils {
.build();
zkClient.start();
- if (zkClient.blockUntilConnected(zkConnectionTimeoutInSec, TimeUnit.SECONDS)) {
- LOG.info("Connected to ZK cluster '{}', client in state: [{}]", zkCluster, zkClient.getState());
- } else {
- throw new IOException(String.format("Can't contact ZK cluster '%s' after 10 seconds", zkCluster));
+
+ try {
+ if (zkClient.blockUntilConnected(zkConnectionTimeoutInSec, TimeUnit.SECONDS)) {
+ LOG.info("Connected to ZK cluster '{}', client in state: [{}]", zkCluster, zkClient.getState());
+ } else {
+ String errorMsg = String.format("Can't contact ZK cluster '%s' after %d seconds",
+ zkCluster, zkConnectionTimeoutInSec);
+ throw new IOException(errorMsg);
+ }
+ } catch (InterruptedException ex) {
+ throw new IOException(String.format("Interrupted whilst connecting to ZK cluster '%s'", zkCluster));
}
return zkClient;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/83c252b4/examples/src/main/java/org/apache/omid/examples/ConfigurationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/omid/examples/ConfigurationExample.java b/examples/src/main/java/org/apache/omid/examples/ConfigurationExample.java
index 17457c6..aa59245 100644
--- a/examples/src/main/java/org/apache/omid/examples/ConfigurationExample.java
+++ b/examples/src/main/java/org/apache/omid/examples/ConfigurationExample.java
@@ -22,7 +22,6 @@ import org.apache.omid.transaction.HBaseTransactionManager;
import org.apache.omid.transaction.RollbackException;
import org.apache.omid.transaction.TTable;
import org.apache.omid.transaction.Transaction;
-import org.apache.omid.transaction.TransactionException;
import org.apache.omid.transaction.TransactionManager;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.hbase.client.Put;
@@ -91,7 +90,7 @@ public class ConfigurationExample {
}
private void doWork(String userTableName, byte[] family, HBaseOmidClientConfiguration configuration)
- throws IOException, TransactionException, RollbackException, InterruptedException {
+ throws IOException, RollbackException, InterruptedException {
byte[] exampleRow1 = Bytes.toBytes("EXAMPLE_ROW1");
byte[] exampleRow2 = Bytes.toBytes("EXAMPLE_ROW2");
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/83c252b4/hbase-client/src/test/java/org/apache/omid/transaction/TestEndToEndScenariosWithHA.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestEndToEndScenariosWithHA.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestEndToEndScenariosWithHA.java
index ce69bf5..dba54f5 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestEndToEndScenariosWithHA.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestEndToEndScenariosWithHA.java
@@ -369,7 +369,7 @@ public class TestEndToEndScenariosWithHA extends OmidTestBase {
}
private void checkRowValues(TTable txTable, byte[] expectedDataR1Q1, byte[] expectedDataR2Q2)
- throws TransactionException, IOException, RollbackException {
+ throws IOException, RollbackException {
Transaction readTx = tm.begin();
LOG.info("Starting Read Tx {} for checking cell values", readTx.getTransactionId());
Get getRow1 = new Get(row1).setMaxVersions(1);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/83c252b4/hbase-client/src/test/java/org/apache/omid/transaction/TestTxMgrFailover.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestTxMgrFailover.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestTxMgrFailover.java
index 5c64874..f37808d 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestTxMgrFailover.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestTxMgrFailover.java
@@ -204,7 +204,7 @@ public class TestTxMgrFailover extends OmidTestBase {
}
- private void executeTxAndCheckRollback() throws IOException, TransactionException, InterruptedException, java.util.concurrent.ExecutionException {
+ private void executeTxAndCheckRollback() throws IOException, InterruptedException, java.util.concurrent.ExecutionException {
try (TTable txTable = new TTable(hbaseConf, TEST_TABLE)) {
HBaseTransaction tx1 = (HBaseTransaction) tm.begin();
assertEquals(tx1.getStartTimestamp(), TX1_ST);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/83c252b4/timestamp-storage/src/main/java/org/apache/omid/timestamp/storage/ZKModule.java
----------------------------------------------------------------------
diff --git a/timestamp-storage/src/main/java/org/apache/omid/timestamp/storage/ZKModule.java b/timestamp-storage/src/main/java/org/apache/omid/timestamp/storage/ZKModule.java
index a6d959f..468511e 100644
--- a/timestamp-storage/src/main/java/org/apache/omid/timestamp/storage/ZKModule.java
+++ b/timestamp-storage/src/main/java/org/apache/omid/timestamp/storage/ZKModule.java
@@ -42,7 +42,7 @@ public class ZKModule extends AbstractModule {
@Provides
@Singleton
- CuratorFramework provideInitializedZookeeperClient() throws IOException, InterruptedException {
+ CuratorFramework provideInitializedZookeeperClient() throws IOException {
return ZKUtils.initZKClient(zkCluster, namespace, 10);
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/83c252b4/transaction-client/src/main/java/org/apache/omid/transaction/TransactionException.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/org/apache/omid/transaction/TransactionException.java b/transaction-client/src/main/java/org/apache/omid/transaction/TransactionException.java
index d843327..e549989 100644
--- a/transaction-client/src/main/java/org/apache/omid/transaction/TransactionException.java
+++ b/transaction-client/src/main/java/org/apache/omid/transaction/TransactionException.java
@@ -17,7 +17,9 @@
*/
package org.apache.omid.transaction;
-public class TransactionException extends Exception {
+import java.io.IOException;
+
+public class TransactionException extends IOException {
private static final long serialVersionUID = 7273525983622126275L;
@@ -28,4 +30,5 @@ public class TransactionException extends Exception {
public TransactionException(String reason, Throwable e) {
super(reason, e);
}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/83c252b4/transaction-client/src/main/java/org/apache/omid/tso/client/TSOClient.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/org/apache/omid/tso/client/TSOClient.java b/transaction-client/src/main/java/org/apache/omid/tso/client/TSOClient.java
index def591a..260df53 100644
--- a/transaction-client/src/main/java/org/apache/omid/tso/client/TSOClient.java
+++ b/transaction-client/src/main/java/org/apache/omid/tso/client/TSOClient.java
@@ -96,13 +96,12 @@ public class TSOClient implements TSOProtocol, NodeCacheListener {
// Construction
// ----------------------------------------------------------------------------------------------------------------
- public static TSOClient newInstance(OmidClientConfiguration tsoClientConf)
- throws IOException, InterruptedException {
+ public static TSOClient newInstance(OmidClientConfiguration tsoClientConf) throws IOException {
return new TSOClient(tsoClientConf);
}
// Avoid instantiation
- private TSOClient(OmidClientConfiguration omidConf) throws IOException, InterruptedException {
+ private TSOClient(OmidClientConfiguration omidConf) throws IOException {
// Start client with Nb of active threads = 3 as maximum.
int tsoExecutorThreads = omidConf.getExecutorThreads();