accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/8] accumulo git commit: ACCUMULO-3419 Quote the colvis and increase ZK client timeout
Date Mon, 15 Dec 2014 16:44:22 GMT
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 <elserj@apache.org>
Authored: Mon Dec 15 10:55:19 2014 -0500
Committer: Josh Elser <elserj@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);


Mime
View raw message