You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/12/15 17:44:22 UTC
[1/8] accumulo git commit: ACCUMULO-3419 Quote the colvis and
increase ZK client timeout
Repository: accumulo
Updated Branches:
refs/heads/1.6 cabf265ae -> b1bf41ec9
refs/heads/master d00da3a24 -> bf6ca04f3
ACCUMULO-3419 Quote the colvis and increase ZK client timeout
Quote the column visibility so the shell doesn't try to interpret
the pipe character. Increase the ZK client timeout because a one
second timeout will repeatedly fail.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0abfa273
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0abfa273
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0abfa273
Branch: refs/heads/1.6
Commit: 0abfa273de10c80580e1a0a27ed59bca117e8190
Parents: c07e3d0
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 10:55:19 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 10:55:19 2014 -0500
----------------------------------------------------------------------
.../accumulo/examples/simple/client/TracingExample.java | 2 +-
.../org/apache/accumulo/test/functional/ExamplesIT.java | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0abfa273/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
index a542263..423cf4b 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
@@ -64,7 +64,7 @@ public class TracingExample {
}
public void enableTracing(Opts opts) throws Exception {
- DistributedTrace.enable(opts.getInstance(), new ZooReader(opts.getInstance().getZooKeepers(), 1000), "myHost", "myApp");
+ DistributedTrace.enable(opts.getInstance(), new ZooReader(opts.getInstance().getZooKeepers(), 15000), "myHost", "myApp");
}
public void execute(Opts opts) throws TableNotFoundException, InterruptedException, AccumuloException, AccumuloSecurityException, TableExistsException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0abfa273/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index 5bced81..6126a72 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -99,7 +99,8 @@ public class ExamplesIT extends AccumuloClusterIT {
private static final Logger log = Logger.getLogger(ExamplesIT.class);
private static final BatchWriterOpts bwOpts = new BatchWriterOpts();
private static final BatchWriterConfig bwc = new BatchWriterConfig();
- private static final String visibility = "A|B";
+ // quoted to make sure the shell doesn't interpret the pipe
+ private static final String visibility = "\"A|B\"";
private static final String auths = "A,B";
Connector c;
@@ -200,7 +201,7 @@ public class ExamplesIT extends AccumuloClusterIT {
Entry<Integer,String> entry = getClusterControl().execWithStdout(
Ingest.class,
new String[] {"-i", instance, "-z", keepers, "-u", user, "-p", passwd, "--dirTable", dirTable, "--indexTable", indexTable, "--dataTable", dataTable,
- "--vis", "'" + visibility + "'", "--chunkSize", Integer.toString(10000), getUsableDir()});
+ "--vis", visibility, "--chunkSize", Integer.toString(10000), getUsableDir()});
assertEquals("Got non-zero return code. Stdout=" + entry.getValue(), 0, entry.getKey().intValue());
entry = getClusterControl()
.execWithStdout(
@@ -416,7 +417,7 @@ public class ExamplesIT extends AccumuloClusterIT {
String tableName = getUniqueNames(1)[0];
c.tableOperations().create(tableName);
goodExec(SequentialBatchWriter.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd, "-t", tableName, "--start", "0", "--num", "100000",
- "--size", "50", "--batchMemory", "10000000", "--batchLatency", "1000", "--batchThreads", "4", "--vis", "'" + visibility + "'");
+ "--size", "50", "--batchMemory", "10000000", "--batchLatency", "1000", "--batchThreads", "4", "--vis", visibility);
}
@@ -434,7 +435,7 @@ public class ExamplesIT extends AccumuloClusterIT {
String tableName = getUniqueNames(1)[0];
c.tableOperations().create(tableName);
goodExec(RandomBatchWriter.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd, "--table", tableName, "--num", "100000", "--min", "0", "--max",
- "100000", "--size", "100", "--batchMemory", "1000000", "--batchLatency", "1000", "--batchThreads", "4", "--vis", "'" + visibility + "'");
+ "100000", "--size", "100", "--batchMemory", "1000000", "--batchLatency", "1000", "--batchThreads", "4", "--vis", visibility);
goodExec(RandomBatchScanner.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd, "--table", tableName, "--num", "10000", "--min", "0", "--max",
"100000", "--size", "100", "--scanThreads", "4", "--auths", auths);
goodExec(Flush.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd, "--table", tableName);
[7/8] accumulo git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/accumulo
Posted by el...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0dc2db58
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0dc2db58
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0dc2db58
Branch: refs/heads/master
Commit: 0dc2db58455ae23ea5dfdf5b547a655eedbf8b33
Parents: 5427a59 d00da3a
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 11:44:02 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 11:44:02 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/monitor/Monitor.java | 4 +-
.../monitor/servlets/MasterServlet.java | 2 +
.../monitor/servlets/PreciseNumberType.java | 39 ------------------
.../accumulo/monitor/servlets/ScanServlet.java | 16 ++++----
.../util/celltypes/PreciseNumberType.java | 42 ++++++++++++++++++++
.../util/celltypes/PreciseNumberTypeTest.java | 4 +-
6 files changed, 55 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
[5/8] accumulo git commit: Merge branch '1.6' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Posted by el...@apache.org.
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b1bf41ec
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b1bf41ec
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b1bf41ec
Branch: refs/heads/master
Commit: b1bf41ec9aefde6340f1643f3dadc19e7ce85748
Parents: 0abfa27 cabf265
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 11:43:57 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 11:43:57 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/monitor/Monitor.java | 4 +-
.../monitor/servlets/MasterServlet.java | 2 +
.../monitor/servlets/PreciseNumberType.java | 39 ------------------
.../accumulo/monitor/servlets/ScanServlet.java | 16 ++++----
.../util/celltypes/PreciseNumberType.java | 42 ++++++++++++++++++++
.../util/celltypes/PreciseNumberTypeTest.java | 4 +-
6 files changed, 55 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
[2/8] accumulo git commit: ACCUMULO-3419 Quote the colvis and
increase ZK client timeout
Posted by el...@apache.org.
ACCUMULO-3419 Quote the colvis and increase ZK client timeout
Quote the column visibility so the shell doesn't try to interpret
the pipe character. Increase the ZK client timeout because a one
second timeout will repeatedly fail.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0abfa273
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0abfa273
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0abfa273
Branch: refs/heads/master
Commit: 0abfa273de10c80580e1a0a27ed59bca117e8190
Parents: c07e3d0
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 10:55:19 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 10:55:19 2014 -0500
----------------------------------------------------------------------
.../accumulo/examples/simple/client/TracingExample.java | 2 +-
.../org/apache/accumulo/test/functional/ExamplesIT.java | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0abfa273/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
index a542263..423cf4b 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
@@ -64,7 +64,7 @@ public class TracingExample {
}
public void enableTracing(Opts opts) throws Exception {
- DistributedTrace.enable(opts.getInstance(), new ZooReader(opts.getInstance().getZooKeepers(), 1000), "myHost", "myApp");
+ DistributedTrace.enable(opts.getInstance(), new ZooReader(opts.getInstance().getZooKeepers(), 15000), "myHost", "myApp");
}
public void execute(Opts opts) throws TableNotFoundException, InterruptedException, AccumuloException, AccumuloSecurityException, TableExistsException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0abfa273/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index 5bced81..6126a72 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -99,7 +99,8 @@ public class ExamplesIT extends AccumuloClusterIT {
private static final Logger log = Logger.getLogger(ExamplesIT.class);
private static final BatchWriterOpts bwOpts = new BatchWriterOpts();
private static final BatchWriterConfig bwc = new BatchWriterConfig();
- private static final String visibility = "A|B";
+ // quoted to make sure the shell doesn't interpret the pipe
+ private static final String visibility = "\"A|B\"";
private static final String auths = "A,B";
Connector c;
@@ -200,7 +201,7 @@ public class ExamplesIT extends AccumuloClusterIT {
Entry<Integer,String> entry = getClusterControl().execWithStdout(
Ingest.class,
new String[] {"-i", instance, "-z", keepers, "-u", user, "-p", passwd, "--dirTable", dirTable, "--indexTable", indexTable, "--dataTable", dataTable,
- "--vis", "'" + visibility + "'", "--chunkSize", Integer.toString(10000), getUsableDir()});
+ "--vis", visibility, "--chunkSize", Integer.toString(10000), getUsableDir()});
assertEquals("Got non-zero return code. Stdout=" + entry.getValue(), 0, entry.getKey().intValue());
entry = getClusterControl()
.execWithStdout(
@@ -416,7 +417,7 @@ public class ExamplesIT extends AccumuloClusterIT {
String tableName = getUniqueNames(1)[0];
c.tableOperations().create(tableName);
goodExec(SequentialBatchWriter.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd, "-t", tableName, "--start", "0", "--num", "100000",
- "--size", "50", "--batchMemory", "10000000", "--batchLatency", "1000", "--batchThreads", "4", "--vis", "'" + visibility + "'");
+ "--size", "50", "--batchMemory", "10000000", "--batchLatency", "1000", "--batchThreads", "4", "--vis", visibility);
}
@@ -434,7 +435,7 @@ public class ExamplesIT extends AccumuloClusterIT {
String tableName = getUniqueNames(1)[0];
c.tableOperations().create(tableName);
goodExec(RandomBatchWriter.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd, "--table", tableName, "--num", "100000", "--min", "0", "--max",
- "100000", "--size", "100", "--batchMemory", "1000000", "--batchLatency", "1000", "--batchThreads", "4", "--vis", "'" + visibility + "'");
+ "100000", "--size", "100", "--batchMemory", "1000000", "--batchLatency", "1000", "--batchThreads", "4", "--vis", visibility);
goodExec(RandomBatchScanner.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd, "--table", tableName, "--num", "10000", "--min", "0", "--max",
"100000", "--size", "100", "--scanThreads", "4", "--auths", auths);
goodExec(Flush.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd, "--table", tableName);
[6/8] accumulo git commit: Merge branch '1.6' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Posted by el...@apache.org.
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b1bf41ec
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b1bf41ec
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b1bf41ec
Branch: refs/heads/1.6
Commit: b1bf41ec9aefde6340f1643f3dadc19e7ce85748
Parents: 0abfa27 cabf265
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 11:43:57 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 11:43:57 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/monitor/Monitor.java | 4 +-
.../monitor/servlets/MasterServlet.java | 2 +
.../monitor/servlets/PreciseNumberType.java | 39 ------------------
.../accumulo/monitor/servlets/ScanServlet.java | 16 ++++----
.../util/celltypes/PreciseNumberType.java | 42 ++++++++++++++++++++
.../util/celltypes/PreciseNumberTypeTest.java | 4 +-
6 files changed, 55 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
[8/8] accumulo git commit: Merge branch '1.6'
Posted by el...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bf6ca04f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bf6ca04f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bf6ca04f
Branch: refs/heads/master
Commit: bf6ca04f3a99022a8a9bcde40c7e9778168a5306
Parents: 0dc2db5 b1bf41e
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 11:44:05 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 11:44:05 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/8] accumulo git commit: Merge branch '1.6'
Posted by el...@apache.org.
Merge branch '1.6'
Conflicts:
examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3356e0b3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3356e0b3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3356e0b3
Branch: refs/heads/master
Commit: 3356e0b34dba7f756574ba3662fedac253951e4e
Parents: 923accb 0abfa27
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 11:24:21 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 11:24:21 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/test/functional/ExamplesIT.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3356e0b3/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------
[4/8] accumulo git commit: ACCUMULO-3419 Fix testTrace in master
Posted by el...@apache.org.
ACCUMULO-3419 Fix testTrace in master
Not sure where the extra tracing example invocation
came from, but it's unnecessary. Just need to switch over
the test to account for the flipped application/host pair
from cloudtrace->htrace.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5427a590
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5427a590
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5427a590
Branch: refs/heads/master
Commit: 5427a59048ece3f69a8d7a7a4d45cb4eb91b1e55
Parents: 3356e0b
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 15 11:41:32 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 15 11:41:32 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/test/functional/ExamplesIT.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5427a590/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index 86ad0bc..b47c9ca 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -169,10 +169,7 @@ public class ExamplesIT extends AccumuloClusterIT {
count++;
}
assertTrue(count > 0);
- pair = cluster.getClusterControl().execWithStdout(TracingExample.class,
- new String[] {"-i", instance, "-z", keepers, "-u", user, "-p", passwd, "-C", "-D", "-c"});
- Assert.assertEquals("Expected return code of zero. STDOUT=" + pair.getValue(), 0, pair.getKey().intValue());
- assertTrue(pair.getValue().contains("myHost@myApp"));
+ assertTrue("Output did not contain myApp@myHost", pair.getValue().contains("myApp@myHost"));
if (ClusterType.MINI == getClusterType() && null != trace) {
trace.destroy();
}