You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/03/21 19:55:27 UTC
[1/2] git commit: ACCUMULO-2522 wait for accumulo to be up before
testing the proxy
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT bcb0905c4 -> 32cca6049
ACCUMULO-2522 wait for accumulo to be up before testing the proxy
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31b01e92
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31b01e92
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31b01e92
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 31b01e9228075113f0f81c73678efc2ad7fdd4a1
Parents: 1d608a8
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Mar 21 14:08:05 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Mar 21 14:08:25 2014 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/proxy/SimpleTest.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31b01e92/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
----------------------------------------------------------------------
diff --git a/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java b/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
index 6e5398c..4a461a0 100644
--- a/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
+++ b/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
@@ -34,6 +34,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.Random;
import java.util.Set;
@@ -41,6 +42,8 @@ import java.util.TreeMap;
import java.util.UUID;
import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
@@ -90,7 +93,6 @@ import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
-import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TProtocolFactory;
import org.apache.thrift.server.TServer;
@@ -103,7 +105,6 @@ import org.junit.rules.TemporaryFolder;
* Call every method on the proxy and try to verify that it works.
*/
public class SimpleTest {
- private static final Logger log = Logger.getLogger(SimpleTest.class);
public static TemporaryFolder folder = new TemporaryFolder();
@@ -144,6 +145,11 @@ public class SimpleTest {
.setNumTservers (1);
accumulo = new MiniAccumuloCluster(config);
accumulo.start();
+ // wait for accumulo to be up and functional
+ ZooKeeperInstance zoo = new ZooKeeperInstance(accumulo.getInstanceName(), accumulo.getZooKeepers());
+ Connector c = zoo.getConnector("root", new PasswordToken(secret.getBytes()));
+ for (@SuppressWarnings("unused") Entry<org.apache.accumulo.core.data.Key,Value> entry : c.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS))
+ ;
Properties props = new Properties();
props.put("instance", accumulo.getInstanceName());
@@ -589,7 +595,7 @@ public class SimpleTest {
} catch (TableNotFoundException ex) {}
}
- @Test(timeout = 10000)
+ @Test(timeout = 10 * 000)
public void testExists() throws Exception {
client.createTable(creds, "ett1", false, TimeType.MILLIS);
client.createTable(creds, "ett2", false, TimeType.MILLIS);
[2/2] git commit: Merge branch '1.5.2-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT
Posted by ec...@apache.org.
Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32cca604
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32cca604
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32cca604
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 32cca6049e7518b536dc4c13f48abc5ca8f1d099
Parents: 31b01e9 bcb0905
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Mar 21 14:52:31 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Mar 21 14:52:31 2014 -0400
----------------------------------------------------------------------
.../server/conf/ServerConfiguration.java | 1 -
test/system/auto/README | 104 ------------------
test/system/auto/README.md | 109 +++++++++++++++++++
test/system/bench/README | 44 --------
test/system/bench/README.md | 45 ++++++++
test/system/continuous/README | 80 --------------
test/system/continuous/README.md | 81 ++++++++++++++
test/system/randomwalk/README | 62 -----------
test/system/randomwalk/README.md | 69 ++++++++++++
test/system/scalability/README | 38 -------
test/system/scalability/README.md | 40 +++++++
test/system/test1/README | 26 -----
test/system/test1/README.md | 29 +++++
test/system/test2/README | 7 --
test/system/test2/README.md | 10 ++
test/system/test3/README | 2 -
test/system/test3/README.md | 5 +
test/system/test4/README | 6 -
test/system/test4/README.md | 9 ++
19 files changed, 397 insertions(+), 370 deletions(-)
----------------------------------------------------------------------