[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5655a044 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5655a044 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5655a044 Branch: refs/heads/master Commit: 5655a044e027ed44131de943e2419c3a3289ffce Parents: 0721f8d a20e19f Author: Christopher Tubbs Authored: Thu Mar 27 20:48:02 2014 -0400 Committer: Christopher Tubbs Committed: Thu Mar 27 20:48:02 2014 -0400 -- assemble/src/main/assemblies/component.xml | 17 +- .../core/conf/DefaultConfiguration.java | 13 +- docs/pom.xml| 21 ++ .../chapters/administration.tex | 2 +- .../chapters/table_configuration.tex| 4 +- docs/src/main/resources/administration.html | 171 +++ docs/src/main/resources/bulkIngest.html | 114 ++ docs/src/main/resources/combiners.html | 87 docs/src/main/resources/constraints.html| 50 + docs/src/main/resources/distributedTracing.html | 99 + docs/src/main/resources/documentation.css | 112 ++ docs/src/main/resources/examples/README | 95 docs/src/main/resources/examples/README.batch | 55 + docs/src/main/resources/examples/README.bloom | 219 +++ .../main/resources/examples/README.bulkIngest | 33 +++ .../main/resources/examples/README.classpath| 68 ++ docs/src/main/resources/examples/README.client | 79 +++ .../src/main/resources/examples/README.combiner | 70 ++ .../main/resources/examples/README.constraints | 54 + docs/src/main/resources/examples/README.dirlist | 114 ++ docs/src/main/resources/examples/README.export | 91 .../src/main/resources/examples/README.filedata | 47 docs/src/main/resources/examples/README.filter | 110 ++ .../main/resources/examples/README.helloworld | 47 .../main/resources/examples/README.isolation| 50 + docs/src/main/resources/examples/README.mapred | 154 + .../main/resources/examples/README.maxmutation | 47 docs/src/main/resources/examples/README.regex | 58 + .../main/resources/examples/README.reservations | 66 ++ docs/src/main/resources/examples/README.rowhash | 59 + docs/src/main/resources/examples/README.shard | 67 ++ .../main/resources/examples/README.tabletofile | 59 + .../src/main/resources/examples/README.terasort | 50 + .../main/resources/examples/README.visibility | 131 +++ docs/src/main/resources/index.html | 40 docs/src/main/resources/isolation.html | 51 + docs/src/main/resources/lgroups.html| 45 docs/src/main/resources/metrics.html| 182 +++ docs/src/main/resources/timestamps.html | 160 ++ pom.xml | 4 +- .../accumulo/monitor/servlets/BasicServlet.java | 4 +- .../monitor/servlets/DefaultServlet.java| 26 +-- .../src/main/resources/docs/administration.html | 171 --- .../src/main/resources/docs/bulkIngest.html | 114 -- .../src/main/resources/docs/combiners.html | 85 --- .../src/main/resources/docs/constraints.html| 49 - .../main/resources/docs/distributedTracing.html | 99 - .../src/main/resources/docs/documentation.css | 112 -- .../src/main/resources/docs/examples/README | 95 .../main/resources/docs/examples/README.batch | 55 - .../main/resources/docs/examples/README.bloom | 219 --- .../resources/docs/examples/README.bulkIngest | 33 --- .../resources/docs/examples/README.classpath| 68 -- .../main/resources/docs/examples/README.client | 79 --- .../resources/docs/examples/README.combiner | 70 -- .../resources/docs/examples/README.constraints | 54 - .../main/resources/docs/examples/README.dirlist | 114 -- .../main/resources/docs/examples/README.export | 91 .../resources/docs/examples/README.filedata | 47 .../main/resources/docs/examples/README.filter | 110 -- .../resources/docs/examples/README.helloworld | 47 .../resources/docs/examples/README.isolation| 50 - .../main/resources/docs/examples/README.mapred | 154 - .../resources/docs/examples/README.maxmutation | 47 .../main/resources/docs/examples/README.regex | 58 - .../resources/docs/examples/README.reservations | 66 -- .../main/resources/docs/examples/README.rowhash | 59 - .../main/resources/docs/examples/README.shard | 67 -- .../reso
[1/6] ACCUMULO-1487, ACCUMULO-1491 Stop packaging docs for monitor
Repository: accumulo Updated Branches: refs/heads/master 0721f8dca -> 5655a044e http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/isolation.html -- diff --git a/server/monitor/src/main/resources/docs/isolation.html b/server/monitor/src/main/resources/docs/isolation.html deleted file mode 100644 index d0e77cc..000 --- a/server/monitor/src/main/resources/docs/isolation.html +++ /dev/null @@ -1,39 +0,0 @@ - - - -Accumulo Isolation - - - - -Apache Accumulo Documentation : Isolation - -Scanning - -Accumulo supports the ability to present an isolated view of rows when scanning. There are three possible ways that a row could change in accumulo : - - a mutation applied to a table - iterators executed as part of a minor or major compaction - bulk import of new files - -Isolation guarantees that either all or none of the changes made by these operations on a row are seen. Use the IsolatedScanner to obtain an isolated view of an accumulo table. When using the regular scanner it is possible to see a non isolated view of a row. For example if a mutation modifies three columns, it is possible that you will only see two of those modifications. With the isolated scanner either all three of the changes are seen or none. For an example of this try running the InterferenceTest example. - -At this time there is no client side isolation support for the BatchScanner. You may consider using the WholeRowIterator with the BatchScanner to achieve isolation though. This drawback of doing this is that entire rows are read into memory on the server side. If a row is too big, it may crash a tablet server. The IsolatedScanner buffers rows on the client side so a large row will not crash a tablet server. - -Iterators -When writing server side iterators for accumulo isolation is something to be aware of. A scan time iterator in accumulo reads from a set of data sources. While an iterator is reading data it has an isolated view. However, after it returns a key/value it is possible that accumulo may switch data sources and re-seek the iterator. This is done so that resources may be reclaimed. When the user does not request isolation this can occur after any key is returned. When a user request isolation this will only occur after a new row is returned, in which case it will re-seek to the very beginning of the next possible row. http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/lgroups.html -- diff --git a/server/monitor/src/main/resources/docs/lgroups.html b/server/monitor/src/main/resources/docs/lgroups.html deleted file mode 100644 index 0012ffb..000 --- a/server/monitor/src/main/resources/docs/lgroups.html +++ /dev/null @@ -1,42 +0,0 @@ - - - -Accumulo Locality Groups - - - - -Apache Accumulo Documentation : Locality Groups - -Accumulo supports locality groups similar to those described in the Big Table paper. Locality groups allow vertical partitioning of data by column family. This allows user to configure their tables such that scans over a subset of column families are much faster. The Accumulo locality group model has the following features. - - - There is a default locality group that holds all column families not in a declared locality group. - No requirement to declare locality groups or column families at table creation. - Can change locality group configuration on the fly. - - - -When the locality group configuration for a table is changed it has no effect on existing data. All minor and major compactions that occur after the change will organize data into the new locality group structure. As data is written into a table, it will cause minor and major compactions to occur. Over time this will result in all data being organized according to the new locality groups. If all data must be reorganized into the new locality groups immediately, this can be accomplished by forcing a full major compaction of the table. Use the compact command in the shell to accomplish this. - -There are two ways to manipulate locality groups, via the shell or through the Java API. From the shell use the getgroups and setgroups commands. Through the API, TableOperations has the methods setLocalityGroups() and getLocalityGroups(). - -To limit scans to a set of locality groups, use the fetchColumnFamily() function on Scanner or BatchScanner. From the shell use scan with the -c option. - - - http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/metrics.html -- diff --git a/server/monitor/src/main/resources/docs/metrics.html b/server/monitor/src/main/resources/docs/metrics.html deleted file mode 100644 index 00f0a5b..0
[1/5] ACCUMULO-1487, ACCUMULO-1491 Stop packaging docs for monitor
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 042812287 -> a20e19fc4 http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/isolation.html -- diff --git a/server/monitor/src/main/resources/docs/isolation.html b/server/monitor/src/main/resources/docs/isolation.html deleted file mode 100644 index d0e77cc..000 --- a/server/monitor/src/main/resources/docs/isolation.html +++ /dev/null @@ -1,39 +0,0 @@ - - - -Accumulo Isolation - - - - -Apache Accumulo Documentation : Isolation - -Scanning - -Accumulo supports the ability to present an isolated view of rows when scanning. There are three possible ways that a row could change in accumulo : - - a mutation applied to a table - iterators executed as part of a minor or major compaction - bulk import of new files - -Isolation guarantees that either all or none of the changes made by these operations on a row are seen. Use the IsolatedScanner to obtain an isolated view of an accumulo table. When using the regular scanner it is possible to see a non isolated view of a row. For example if a mutation modifies three columns, it is possible that you will only see two of those modifications. With the isolated scanner either all three of the changes are seen or none. For an example of this try running the InterferenceTest example. - -At this time there is no client side isolation support for the BatchScanner. You may consider using the WholeRowIterator with the BatchScanner to achieve isolation though. This drawback of doing this is that entire rows are read into memory on the server side. If a row is too big, it may crash a tablet server. The IsolatedScanner buffers rows on the client side so a large row will not crash a tablet server. - -Iterators -When writing server side iterators for accumulo isolation is something to be aware of. A scan time iterator in accumulo reads from a set of data sources. While an iterator is reading data it has an isolated view. However, after it returns a key/value it is possible that accumulo may switch data sources and re-seek the iterator. This is done so that resources may be reclaimed. When the user does not request isolation this can occur after any key is returned. When a user request isolation this will only occur after a new row is returned, in which case it will re-seek to the very beginning of the next possible row. http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/lgroups.html -- diff --git a/server/monitor/src/main/resources/docs/lgroups.html b/server/monitor/src/main/resources/docs/lgroups.html deleted file mode 100644 index 0012ffb..000 --- a/server/monitor/src/main/resources/docs/lgroups.html +++ /dev/null @@ -1,42 +0,0 @@ - - - -Accumulo Locality Groups - - - - -Apache Accumulo Documentation : Locality Groups - -Accumulo supports locality groups similar to those described in the Big Table paper. Locality groups allow vertical partitioning of data by column family. This allows user to configure their tables such that scans over a subset of column families are much faster. The Accumulo locality group model has the following features. - - - There is a default locality group that holds all column families not in a declared locality group. - No requirement to declare locality groups or column families at table creation. - Can change locality group configuration on the fly. - - - -When the locality group configuration for a table is changed it has no effect on existing data. All minor and major compactions that occur after the change will organize data into the new locality group structure. As data is written into a table, it will cause minor and major compactions to occur. Over time this will result in all data being organized according to the new locality groups. If all data must be reorganized into the new locality groups immediately, this can be accomplished by forcing a full major compaction of the table. Use the compact command in the shell to accomplish this. - -There are two ways to manipulate locality groups, via the shell or through the Java API. From the shell use the getgroups and setgroups commands. Through the API, TableOperations has the methods setLocalityGroups() and getLocalityGroups(). - -To limit scans to a set of locality groups, use the fetchColumnFamily() function on Scanner or BatchScanner. From the shell use scan with the -c option. - - - http://git-wip-us.apache.org/repos/asf/accumulo/blob/a20e19fc/server/monitor/src/main/resources/docs/metrics.html -- diff --git a/server/monitor/src/main/resources/docs/metrics.html b/server/monitor/src/main/resources/docs/metrics.html deleted file mode 100644 index 00
[1/3] git commit: ACCUMULO-2541 Set seekSleepTime and not (next)sleepTime in ScannerIT
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 6430933a7 -> 042812287
refs/heads/master 904023ae2 -> 0721f8dca
ACCUMULO-2541 Set seekSleepTime and not (next)sleepTime in ScannerIT
Setting a batchSize of 1 will cause a new ScanSession for each k/v returned.
This means that next() will never be called on SlowIterator and thus the
intended effect of waiting server side doesn't actually happen.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04281228
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04281228
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04281228
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 04281228716d3981d88c4769083c4f2f307343fd
Parents: 6430933
Author: Josh Elser
Authored: Thu Mar 27 17:19:26 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 17:19:26 2014 -0700
--
.../java/org/apache/accumulo/test/functional/ScannerIT.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/04281228/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
index f2211e5..3fca421 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
@@ -60,9 +60,12 @@ public class ScannerIT extends SimpleMacIT {
Scanner s = c.createScanner(table, new Authorizations());
IteratorSetting cfg = new IteratorSetting(100, SlowIterator.class);
-SlowIterator.setSleepTime(cfg, 100l);
+// A batch size of one will end up calling seek() for each element with no
calls to next()
+SlowIterator.setSeekSleepTime(cfg, 100l);
+
s.addScanIterator(cfg);
-s.setReadaheadThreshold(5);
+// Never start readahead
+s.setReadaheadThreshold(Long.MAX_VALUE);
s.setBatchSize(1);
s.setRange(new Range());
[2/3] git commit: ACCUMULO-2541 Set seekSleepTime and not (next)sleepTime in ScannerIT
ACCUMULO-2541 Set seekSleepTime and not (next)sleepTime in ScannerIT
Setting a batchSize of 1 will cause a new ScanSession for each k/v returned.
This means that next() will never be called on SlowIterator and thus the
intended effect of waiting server side doesn't actually happen.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04281228
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04281228
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04281228
Branch: refs/heads/master
Commit: 04281228716d3981d88c4769083c4f2f307343fd
Parents: 6430933
Author: Josh Elser
Authored: Thu Mar 27 17:19:26 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 17:19:26 2014 -0700
--
.../java/org/apache/accumulo/test/functional/ScannerIT.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/04281228/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
index f2211e5..3fca421 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java
@@ -60,9 +60,12 @@ public class ScannerIT extends SimpleMacIT {
Scanner s = c.createScanner(table, new Authorizations());
IteratorSetting cfg = new IteratorSetting(100, SlowIterator.class);
-SlowIterator.setSleepTime(cfg, 100l);
+// A batch size of one will end up calling seek() for each element with no
calls to next()
+SlowIterator.setSeekSleepTime(cfg, 100l);
+
s.addScanIterator(cfg);
-s.setReadaheadThreshold(5);
+// Never start readahead
+s.setReadaheadThreshold(Long.MAX_VALUE);
s.setBatchSize(1);
s.setRange(new Range());
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0721f8dc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0721f8dc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0721f8dc Branch: refs/heads/master Commit: 0721f8dca60449d1e7d573992b8ea01d038101f0 Parents: 904023a 0428122 Author: Josh Elser Authored: Thu Mar 27 17:21:31 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 17:21:31 2014 -0700 -- .../java/org/apache/accumulo/test/functional/ScannerIT.java | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) --
[02/10] git commit: ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in test.
ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in
test.
Add some retries to make sure we don't get stale data from ZooCache if we
happen to talk
to the other MAC tserver.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/729e11ad
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/729e11ad
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/729e11ad
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 729e11adfe862d328d82b1df34fdd18493672c32
Parents: 4a05a17
Author: Josh Elser
Authored: Thu Mar 27 15:35:36 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 15:35:36 2014 -0700
--
.../org/apache/accumulo/test/ShellServerTest.java | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/729e11ad/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 7bda585..624b3c2 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -64,6 +64,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.tools.DistCp;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -454,8 +455,17 @@ public class ShellServerTest {
}
});
exec("addauths -s foo,bar", true);
-exec("getauths", true, "foo", true);
-exec("getauths", true, "bar", true);
+boolean passed = false;
+for (int i = 0; i < 50 && !passed; i++) {
+ try {
+exec("getauths", true, "foo", true);
+exec("getauths", true, "bar", true);
+passed = true;
+ } catch (Exception e) {
+UtilWaitThread.sleep(300);
+ }
+}
+Assert.assertTrue("Could not successfully see updated authoriations",
passed);
exec("insert a b c d -l foo");
exec("scan", true, "[foo]");
exec("scan -s bar", true, "[foo]", false);
[10/10] git commit: Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT
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/5b479243 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5b479243 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5b479243 Branch: refs/heads/1.5.2-SNAPSHOT Commit: 5b4792431a00210221b9896a42171abdac56284b Parents: dfbce9b 334f7a7 Author: Josh Elser Authored: Thu Mar 27 16:44:16 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 16:44:16 2014 -0700 -- .../java/org/apache/accumulo/server/problems/ProblemReport.java | 3 +++ 1 file changed, 3 insertions(+) --
[08/10] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6430933a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6430933a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6430933a
Branch: refs/heads/master
Commit: 6430933a7deed7581bf075e3cbcf7914c76b324d
Parents: d3bd456 dfbce9b
Author: Josh Elser
Authored: Thu Mar 27 16:43:46 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 16:43:46 2014 -0700
--
.../org/apache/accumulo/test/ShellServerIT.java | 27 +---
1 file changed, 24 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6430933a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
--
diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index 02fa104,000..87288c7
mode 100644,00..100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@@ -1,1252 -1,0 +1,1273 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
++import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import jline.console.ConsoleReader;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.admin.TableOperations;
+import org.apache.accumulo.core.client.impl.Namespaces;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.file.FileOperations;
+import org.apache.accumulo.core.file.FileSKVWriter;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.RootTable;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.core.util.shell.Shell;
+import org.apache.accumulo.test.functional.FunctionalTestUtils;
+import org.apache.accumulo.test.functional.SimpleMacIT;
+import org.apache.accumulo.tracer.TraceServer;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.tools.DistCp;
+import org.apache.log4j.Logger;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+public class ShellServerIT extends SimpleMacIT {
+ public static class TestOutputStream extends OutputStream {
+StringBuilder sb = new StringBuilder();
+
+@Override
+public void write(int b) throws IOException {
+ sb.append((char) (0xff & b));
+}
+
+public String get() {
+ return sb.toString();
+}
+
+public void clear() {
+ sb.setLength(0);
+
[06/10] git commit: ACCUMULO-2433 More test retries if at first we don't succeed.
ACCUMULO-2433 More test retries if at first we don't succeed.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dfbce9bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dfbce9bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dfbce9bc
Branch: refs/heads/master
Commit: dfbce9bcc361364c5a512406a1e4d9e2fd55ac56
Parents: 729e11a
Author: Josh Elser
Authored: Thu Mar 27 15:58:39 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 15:58:39 2014 -0700
--
.../org/apache/accumulo/test/ShellServerTest.java | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dfbce9bc/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 624b3c2..533fdcf 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -617,7 +618,18 @@ public class ShellServerTest {
exec("addsplits row5 row7");
make10();
exec("flush -w -t " + table);
-List files = getFiles(tableId);
+// Might have some cruft here. Check a couple of times.
+List files = null;
+boolean found = false;
+for (int i = 0; i < 50 && !found; i++) {
+ files = getFiles(tableId);
+ if (3 == files.size()) {
+found = true;
+ } else {
+UtilWaitThread.sleep(300);
+ }
+}
+assertNotNull(files);
assertEquals("Found the following files: " + files, 3, files.size());
exec("deleterows -t " + table + " -b row5 -e row7", true);
assertEquals(2, countFiles(tableId));
[01/10] git commit: ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in test.
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 334f7a724 -> 5b4792431
refs/heads/1.6.0-SNAPSHOT d3bd456e7 -> 6430933a7
refs/heads/master 4cfde769c -> 904023ae2
ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in
test.
Add some retries to make sure we don't get stale data from ZooCache if we
happen to talk
to the other MAC tserver.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/729e11ad
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/729e11ad
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/729e11ad
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 729e11adfe862d328d82b1df34fdd18493672c32
Parents: 4a05a17
Author: Josh Elser
Authored: Thu Mar 27 15:35:36 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 15:35:36 2014 -0700
--
.../org/apache/accumulo/test/ShellServerTest.java | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/729e11ad/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 7bda585..624b3c2 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -64,6 +64,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.tools.DistCp;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -454,8 +455,17 @@ public class ShellServerTest {
}
});
exec("addauths -s foo,bar", true);
-exec("getauths", true, "foo", true);
-exec("getauths", true, "bar", true);
+boolean passed = false;
+for (int i = 0; i < 50 && !passed; i++) {
+ try {
+exec("getauths", true, "foo", true);
+exec("getauths", true, "bar", true);
+passed = true;
+ } catch (Exception e) {
+UtilWaitThread.sleep(300);
+ }
+}
+Assert.assertTrue("Could not successfully see updated authoriations",
passed);
exec("insert a b c d -l foo");
exec("scan", true, "[foo]");
exec("scan -s bar", true, "[foo]", false);
[04/10] git commit: ACCUMULO-2433 More test retries if at first we don't succeed.
ACCUMULO-2433 More test retries if at first we don't succeed.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dfbce9bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dfbce9bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dfbce9bc
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: dfbce9bcc361364c5a512406a1e4d9e2fd55ac56
Parents: 729e11a
Author: Josh Elser
Authored: Thu Mar 27 15:58:39 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 15:58:39 2014 -0700
--
.../org/apache/accumulo/test/ShellServerTest.java | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dfbce9bc/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 624b3c2..533fdcf 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -617,7 +618,18 @@ public class ShellServerTest {
exec("addsplits row5 row7");
make10();
exec("flush -w -t " + table);
-List files = getFiles(tableId);
+// Might have some cruft here. Check a couple of times.
+List files = null;
+boolean found = false;
+for (int i = 0; i < 50 && !found; i++) {
+ files = getFiles(tableId);
+ if (3 == files.size()) {
+found = true;
+ } else {
+UtilWaitThread.sleep(300);
+ }
+}
+assertNotNull(files);
assertEquals("Found the following files: " + files, 3, files.size());
exec("deleterows -t " + table + " -b row5 -e row7", true);
assertEquals(2, countFiles(tableId));
[07/10] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6430933a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6430933a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6430933a
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6430933a7deed7581bf075e3cbcf7914c76b324d
Parents: d3bd456 dfbce9b
Author: Josh Elser
Authored: Thu Mar 27 16:43:46 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 16:43:46 2014 -0700
--
.../org/apache/accumulo/test/ShellServerIT.java | 27 +---
1 file changed, 24 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6430933a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
--
diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index 02fa104,000..87288c7
mode 100644,00..100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@@ -1,1252 -1,0 +1,1273 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
++import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import jline.console.ConsoleReader;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.admin.TableOperations;
+import org.apache.accumulo.core.client.impl.Namespaces;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.file.FileOperations;
+import org.apache.accumulo.core.file.FileSKVWriter;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.RootTable;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.core.util.shell.Shell;
+import org.apache.accumulo.test.functional.FunctionalTestUtils;
+import org.apache.accumulo.test.functional.SimpleMacIT;
+import org.apache.accumulo.tracer.TraceServer;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.tools.DistCp;
+import org.apache.log4j.Logger;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+public class ShellServerIT extends SimpleMacIT {
+ public static class TestOutputStream extends OutputStream {
+StringBuilder sb = new StringBuilder();
+
+@Override
+public void write(int b) throws IOException {
+ sb.append((char) (0xff & b));
+}
+
+public String get() {
+ return sb.toString();
+}
+
+public void clear() {
+ sb.setLength(0)
[09/10] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/904023ae Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/904023ae Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/904023ae Branch: refs/heads/master Commit: 904023ae24a68d68b4711883b4f27ad4f3c7e1fa Parents: 4cfde76 6430933 Author: Josh Elser Authored: Thu Mar 27 16:44:02 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 16:44:02 2014 -0700 -- .../org/apache/accumulo/test/ShellServerIT.java | 27 +--- 1 file changed, 24 insertions(+), 3 deletions(-) --
[03/10] git commit: ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in test.
ACCUMULO-2433 Can't reliably assume we won't get stale data with >1 tserver in
test.
Add some retries to make sure we don't get stale data from ZooCache if we
happen to talk
to the other MAC tserver.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/729e11ad
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/729e11ad
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/729e11ad
Branch: refs/heads/master
Commit: 729e11adfe862d328d82b1df34fdd18493672c32
Parents: 4a05a17
Author: Josh Elser
Authored: Thu Mar 27 15:35:36 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 15:35:36 2014 -0700
--
.../org/apache/accumulo/test/ShellServerTest.java | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/729e11ad/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 7bda585..624b3c2 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -64,6 +64,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.tools.DistCp;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -454,8 +455,17 @@ public class ShellServerTest {
}
});
exec("addauths -s foo,bar", true);
-exec("getauths", true, "foo", true);
-exec("getauths", true, "bar", true);
+boolean passed = false;
+for (int i = 0; i < 50 && !passed; i++) {
+ try {
+exec("getauths", true, "foo", true);
+exec("getauths", true, "bar", true);
+passed = true;
+ } catch (Exception e) {
+UtilWaitThread.sleep(300);
+ }
+}
+Assert.assertTrue("Could not successfully see updated authoriations",
passed);
exec("insert a b c d -l foo");
exec("scan", true, "[foo]");
exec("scan -s bar", true, "[foo]", false);
[05/10] git commit: ACCUMULO-2433 More test retries if at first we don't succeed.
ACCUMULO-2433 More test retries if at first we don't succeed.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dfbce9bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dfbce9bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dfbce9bc
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: dfbce9bcc361364c5a512406a1e4d9e2fd55ac56
Parents: 729e11a
Author: Josh Elser
Authored: Thu Mar 27 15:58:39 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 15:58:39 2014 -0700
--
.../org/apache/accumulo/test/ShellServerTest.java | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dfbce9bc/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 624b3c2..533fdcf 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -617,7 +618,18 @@ public class ShellServerTest {
exec("addsplits row5 row7");
make10();
exec("flush -w -t " + table);
-List files = getFiles(tableId);
+// Might have some cruft here. Check a couple of times.
+List files = null;
+boolean found = false;
+for (int i = 0; i < 50 && !found; i++) {
+ files = getFiles(tableId);
+ if (3 == files.size()) {
+found = true;
+ } else {
+UtilWaitThread.sleep(300);
+ }
+}
+assertNotNull(files);
assertEquals("Found the following files: " + files, 3, files.size());
exec("deleterows -t " + table + " -b row5 -e row7", true);
assertEquals(2, countFiles(tableId));
[05/11] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' 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/334f7a72
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/334f7a72
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/334f7a72
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 334f7a724c77616e307f2e3090e30074c5ede5b9
Parents: 4a05a17 1258b4e
Author: Bill Havanki
Authored: Thu Mar 27 17:21:00 2014 -0400
Committer: Bill Havanki
Committed: Thu Mar 27 17:21:00 2014 -0400
--
.../java/org/apache/accumulo/server/problems/ProblemReport.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/334f7a72/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
--
diff --cc
server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index 6b32117,000..0c7e2d1
mode 100644,00..100644
---
a/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++
b/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@@ -1,221 -1,0 +1,224 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.server.problems;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Map.Entry;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Value;
++import org.apache.accumulo.core.util.ArgumentChecker;
+import org.apache.accumulo.core.util.Encoding;
+import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
+import org.apache.accumulo.server.client.HdfsZooInstance;
+import org.apache.accumulo.server.security.SecurityConstants;
+import org.apache.accumulo.server.util.MetadataTable;
+import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
+import org.apache.hadoop.io.Text;
+
+public class ProblemReport {
+ private String tableName;
+ private ProblemType problemType;
+ private String resource;
+ private String exception;
+ private String server;
+ private long creationTime;
+
+ public ProblemReport(String table, ProblemType problemType, String
resource, String server, Throwable e) {
++ArgumentChecker.notNull(table, problemType, resource);
+this.tableName = table;
+
+this.problemType = problemType;
+this.resource = resource;
+
+if (e != null) {
+ this.exception = e.getMessage();
+}
+
+if (server == null) {
+ try {
+server = InetAddress.getLocalHost().getHostAddress();
+ } catch (UnknownHostException e1) {
+
+ }
+}
+
+this.server = server;
+this.creationTime = System.currentTimeMillis();
+ }
+
+ public ProblemReport(String table, ProblemType problemType, String
resource, Throwable e) {
+this(table, problemType, resource, null, e);
+ }
+
+ private ProblemReport(String table, ProblemType problemType, String
resource, byte enc[]) throws IOException {
++ArgumentChecker.notNull(table, problemType, resource);
+this.tableName = table;
+this.problemType = problemType;
+this.resource = resource;
+
+decode(enc);
+ }
+
+ private byte[] encode() throws IOException {
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+DataOutputStream dos = new DataOutputStream(baos);
+
+dos.writeLong(creationTime);
+
+dos.writeBoolean(server != null);
+if (server != null) {
+ dos.writeUTF(server);
+}
+
+dos.writeBoolean(exception != n
[07/11] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' 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/334f7a72
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/334f7a72
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/334f7a72
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 334f7a724c77616e307f2e3090e30074c5ede5b9
Parents: 4a05a17 1258b4e
Author: Bill Havanki
Authored: Thu Mar 27 17:21:00 2014 -0400
Committer: Bill Havanki
Committed: Thu Mar 27 17:21:00 2014 -0400
--
.../java/org/apache/accumulo/server/problems/ProblemReport.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/334f7a72/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
--
diff --cc
server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index 6b32117,000..0c7e2d1
mode 100644,00..100644
---
a/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++
b/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@@ -1,221 -1,0 +1,224 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.server.problems;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Map.Entry;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Value;
++import org.apache.accumulo.core.util.ArgumentChecker;
+import org.apache.accumulo.core.util.Encoding;
+import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
+import org.apache.accumulo.server.client.HdfsZooInstance;
+import org.apache.accumulo.server.security.SecurityConstants;
+import org.apache.accumulo.server.util.MetadataTable;
+import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
+import org.apache.hadoop.io.Text;
+
+public class ProblemReport {
+ private String tableName;
+ private ProblemType problemType;
+ private String resource;
+ private String exception;
+ private String server;
+ private long creationTime;
+
+ public ProblemReport(String table, ProblemType problemType, String
resource, String server, Throwable e) {
++ArgumentChecker.notNull(table, problemType, resource);
+this.tableName = table;
+
+this.problemType = problemType;
+this.resource = resource;
+
+if (e != null) {
+ this.exception = e.getMessage();
+}
+
+if (server == null) {
+ try {
+server = InetAddress.getLocalHost().getHostAddress();
+ } catch (UnknownHostException e1) {
+
+ }
+}
+
+this.server = server;
+this.creationTime = System.currentTimeMillis();
+ }
+
+ public ProblemReport(String table, ProblemType problemType, String
resource, Throwable e) {
+this(table, problemType, resource, null, e);
+ }
+
+ private ProblemReport(String table, ProblemType problemType, String
resource, byte enc[]) throws IOException {
++ArgumentChecker.notNull(table, problemType, resource);
+this.tableName = table;
+this.problemType = problemType;
+this.resource = resource;
+
+decode(enc);
+ }
+
+ private byte[] encode() throws IOException {
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+DataOutputStream dos = new DataOutputStream(baos);
+
+dos.writeLong(creationTime);
+
+dos.writeBoolean(server != null);
+if (server != null) {
+ dos.writeUTF(server);
+}
+
+dos.writeBoolean(exception != n
[03/11] git commit: ACCUMULO-2524 Check for null args to ProblemReport constructors
ACCUMULO-2524 Check for null args to ProblemReport constructors
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1258b4e0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1258b4e0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1258b4e0
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1258b4e0352e99d70b34b1131a4cfa5f90afd6ff
Parents: 4619101
Author: Bill Havanki
Authored: Thu Mar 27 17:19:24 2014 -0400
Committer: Bill Havanki
Committed: Thu Mar 27 17:19:24 2014 -0400
--
.../java/org/apache/accumulo/server/problems/ProblemReport.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1258b4e0/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
b/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index 06959d0..bc8f8ac 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@ -29,6 +29,7 @@ import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.Encoding;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -48,6 +49,7 @@ public class ProblemReport {
private long creationTime;
public ProblemReport(String table, ProblemType problemType, String resource,
String server, Throwable e) {
+ArgumentChecker.notNull(table, problemType, resource);
this.tableName = table;
this.problemType = problemType;
@@ -74,6 +76,7 @@ public class ProblemReport {
}
private ProblemReport(String table, ProblemType problemType, String
resource, byte enc[]) throws IOException {
+ArgumentChecker.notNull(table, problemType, resource);
this.tableName = table;
this.problemType = problemType;
this.resource = resource;
[11/11] git commit: ACCUMULO-2524 Update ProblemReport to use Preconditions over ArgumentChecker
ACCUMULO-2524 Update ProblemReport to use Preconditions over ArgumentChecker
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4cfde769
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cfde769
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4cfde769
Branch: refs/heads/master
Commit: 4cfde769c0d1d12de40993c3b25776a64bcf00a8
Parents: 367a4d0
Author: Bill Havanki
Authored: Thu Mar 27 17:35:07 2014 -0400
Committer: Bill Havanki
Committed: Thu Mar 27 17:35:07 2014 -0400
--
.../apache/accumulo/server/problems/ProblemReport.java| 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cfde769/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
--
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index decc995..d0aef3d 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.server.problems;
+import static com.google.common.base.Preconditions.checkNotNull;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
@@ -29,7 +30,6 @@ import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.Encoding;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -49,7 +49,9 @@ public class ProblemReport {
private long creationTime;
public ProblemReport(String table, ProblemType problemType, String resource,
String server, Throwable e) {
-ArgumentChecker.notNull(table, problemType, resource);
+checkNotNull(table, "table is null");
+checkNotNull(problemType, "problemType is null");
+checkNotNull(resource, "resource is null");
this.tableName = table;
this.problemType = problemType;
@@ -76,7 +78,9 @@ public class ProblemReport {
}
private ProblemReport(String table, ProblemType problemType, String
resource, byte enc[]) throws IOException {
-ArgumentChecker.notNull(table, problemType, resource);
+checkNotNull(table, "table is null");
+checkNotNull(problemType, "problemType is null");
+checkNotNull(resource, "resource is null");
this.tableName = table;
this.problemType = problemType;
this.resource = resource;
[08/11] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3bd456e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3bd456e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3bd456e
Branch: refs/heads/master
Commit: d3bd456e7e397f1a658f794b9d72f5eec50cf607
Parents: 3ce0bfd 334f7a7
Author: Bill Havanki
Authored: Thu Mar 27 17:21:45 2014 -0400
Committer: Bill Havanki
Committed: Thu Mar 27 17:21:45 2014 -0400
--
.../java/org/apache/accumulo/server/problems/ProblemReport.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3bd456e/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
--
diff --cc
server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index fec4e55,000..decc995
mode 100644,00..100644
---
a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@@ -1,221 -1,0 +1,224 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.server.problems;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Map.Entry;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Value;
++import org.apache.accumulo.core.util.ArgumentChecker;
+import org.apache.accumulo.core.util.Encoding;
+import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
+import org.apache.accumulo.server.client.HdfsZooInstance;
+import org.apache.accumulo.server.security.SystemCredentials;
+import org.apache.accumulo.server.util.MetadataTableUtil;
+import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
+import org.apache.hadoop.io.Text;
+
+public class ProblemReport {
+ private String tableName;
+ private ProblemType problemType;
+ private String resource;
+ private String exception;
+ private String server;
+ private long creationTime;
+
+ public ProblemReport(String table, ProblemType problemType, String
resource, String server, Throwable e) {
++ArgumentChecker.notNull(table, problemType, resource);
+this.tableName = table;
+
+this.problemType = problemType;
+this.resource = resource;
+
+if (e != null) {
+ this.exception = e.getMessage();
+}
+
+if (server == null) {
+ try {
+server = InetAddress.getLocalHost().getHostAddress();
+ } catch (UnknownHostException e1) {
+
+ }
+}
+
+this.server = server;
+this.creationTime = System.currentTimeMillis();
+ }
+
+ public ProblemReport(String table, ProblemType problemType, String
resource, Throwable e) {
+this(table, problemType, resource, null, e);
+ }
+
+ private ProblemReport(String table, ProblemType problemType, String
resource, byte enc[]) throws IOException {
++ArgumentChecker.notNull(table, problemType, resource);
+this.tableName = table;
+this.problemType = problemType;
+this.resource = resource;
+
+decode(enc);
+ }
+
+ private byte[] encode() throws IOException {
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+DataOutputStream dos = new DataOutputStream(baos);
+
+dos.writeLong(creationTime);
+
+dos.writeBoolean(server != null);
+if (server != null) {
+ dos.writeUTF(server);
+}
+
+dos.writeBoolea
[01/11] git commit: ACCUMULO-2524 Check for null args to ProblemReport constructors
Repository: accumulo
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 461910148 -> 1258b4e03
refs/heads/1.5.2-SNAPSHOT 4a05a17de -> 334f7a724
refs/heads/1.6.0-SNAPSHOT 3ce0bfda3 -> d3bd456e7
refs/heads/master 3c935b129 -> 4cfde769c
ACCUMULO-2524 Check for null args to ProblemReport constructors
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1258b4e0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1258b4e0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1258b4e0
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 1258b4e0352e99d70b34b1131a4cfa5f90afd6ff
Parents: 4619101
Author: Bill Havanki
Authored: Thu Mar 27 17:19:24 2014 -0400
Committer: Bill Havanki
Committed: Thu Mar 27 17:19:24 2014 -0400
--
.../java/org/apache/accumulo/server/problems/ProblemReport.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1258b4e0/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
b/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index 06959d0..bc8f8ac 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@ -29,6 +29,7 @@ import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.Encoding;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -48,6 +49,7 @@ public class ProblemReport {
private long creationTime;
public ProblemReport(String table, ProblemType problemType, String resource,
String server, Throwable e) {
+ArgumentChecker.notNull(table, problemType, resource);
this.tableName = table;
this.problemType = problemType;
@@ -74,6 +76,7 @@ public class ProblemReport {
}
private ProblemReport(String table, ProblemType problemType, String
resource, byte enc[]) throws IOException {
+ArgumentChecker.notNull(table, problemType, resource);
this.tableName = table;
this.problemType = problemType;
this.resource = resource;
[06/11] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' 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/334f7a72
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/334f7a72
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/334f7a72
Branch: refs/heads/master
Commit: 334f7a724c77616e307f2e3090e30074c5ede5b9
Parents: 4a05a17 1258b4e
Author: Bill Havanki
Authored: Thu Mar 27 17:21:00 2014 -0400
Committer: Bill Havanki
Committed: Thu Mar 27 17:21:00 2014 -0400
--
.../java/org/apache/accumulo/server/problems/ProblemReport.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/334f7a72/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
--
diff --cc
server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index 6b32117,000..0c7e2d1
mode 100644,00..100644
---
a/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++
b/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@@ -1,221 -1,0 +1,224 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.server.problems;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Map.Entry;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Value;
++import org.apache.accumulo.core.util.ArgumentChecker;
+import org.apache.accumulo.core.util.Encoding;
+import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
+import org.apache.accumulo.server.client.HdfsZooInstance;
+import org.apache.accumulo.server.security.SecurityConstants;
+import org.apache.accumulo.server.util.MetadataTable;
+import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
+import org.apache.hadoop.io.Text;
+
+public class ProblemReport {
+ private String tableName;
+ private ProblemType problemType;
+ private String resource;
+ private String exception;
+ private String server;
+ private long creationTime;
+
+ public ProblemReport(String table, ProblemType problemType, String
resource, String server, Throwable e) {
++ArgumentChecker.notNull(table, problemType, resource);
+this.tableName = table;
+
+this.problemType = problemType;
+this.resource = resource;
+
+if (e != null) {
+ this.exception = e.getMessage();
+}
+
+if (server == null) {
+ try {
+server = InetAddress.getLocalHost().getHostAddress();
+ } catch (UnknownHostException e1) {
+
+ }
+}
+
+this.server = server;
+this.creationTime = System.currentTimeMillis();
+ }
+
+ public ProblemReport(String table, ProblemType problemType, String
resource, Throwable e) {
+this(table, problemType, resource, null, e);
+ }
+
+ private ProblemReport(String table, ProblemType problemType, String
resource, byte enc[]) throws IOException {
++ArgumentChecker.notNull(table, problemType, resource);
+this.tableName = table;
+this.problemType = problemType;
+this.resource = resource;
+
+decode(enc);
+ }
+
+ private byte[] encode() throws IOException {
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+DataOutputStream dos = new DataOutputStream(baos);
+
+dos.writeLong(creationTime);
+
+dos.writeBoolean(server != null);
+if (server != null) {
+ dos.writeUTF(server);
+}
+
+dos.writeBoolean(exception != null);
+
[02/11] git commit: ACCUMULO-2524 Check for null args to ProblemReport constructors
ACCUMULO-2524 Check for null args to ProblemReport constructors
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1258b4e0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1258b4e0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1258b4e0
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 1258b4e0352e99d70b34b1131a4cfa5f90afd6ff
Parents: 4619101
Author: Bill Havanki
Authored: Thu Mar 27 17:19:24 2014 -0400
Committer: Bill Havanki
Committed: Thu Mar 27 17:19:24 2014 -0400
--
.../java/org/apache/accumulo/server/problems/ProblemReport.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1258b4e0/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
b/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index 06959d0..bc8f8ac 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@ -29,6 +29,7 @@ import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.Encoding;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -48,6 +49,7 @@ public class ProblemReport {
private long creationTime;
public ProblemReport(String table, ProblemType problemType, String resource,
String server, Throwable e) {
+ArgumentChecker.notNull(table, problemType, resource);
this.tableName = table;
this.problemType = problemType;
@@ -74,6 +76,7 @@ public class ProblemReport {
}
private ProblemReport(String table, ProblemType problemType, String
resource, byte enc[]) throws IOException {
+ArgumentChecker.notNull(table, problemType, resource);
this.tableName = table;
this.problemType = problemType;
this.resource = resource;
[10/11] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/367a4d02 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/367a4d02 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/367a4d02 Branch: refs/heads/master Commit: 367a4d02ddf34ee071ca32834c4ffd8e6554a1e6 Parents: 3c935b1 d3bd456 Author: Bill Havanki Authored: Thu Mar 27 17:22:01 2014 -0400 Committer: Bill Havanki Committed: Thu Mar 27 17:22:01 2014 -0400 -- .../java/org/apache/accumulo/server/problems/ProblemReport.java | 3 +++ 1 file changed, 3 insertions(+) --
[04/11] git commit: ACCUMULO-2524 Check for null args to ProblemReport constructors
ACCUMULO-2524 Check for null args to ProblemReport constructors
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1258b4e0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1258b4e0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1258b4e0
Branch: refs/heads/master
Commit: 1258b4e0352e99d70b34b1131a4cfa5f90afd6ff
Parents: 4619101
Author: Bill Havanki
Authored: Thu Mar 27 17:19:24 2014 -0400
Committer: Bill Havanki
Committed: Thu Mar 27 17:19:24 2014 -0400
--
.../java/org/apache/accumulo/server/problems/ProblemReport.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1258b4e0/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
b/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index 06959d0..bc8f8ac 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@ -29,6 +29,7 @@ import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.Encoding;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -48,6 +49,7 @@ public class ProblemReport {
private long creationTime;
public ProblemReport(String table, ProblemType problemType, String resource,
String server, Throwable e) {
+ArgumentChecker.notNull(table, problemType, resource);
this.tableName = table;
this.problemType = problemType;
@@ -74,6 +76,7 @@ public class ProblemReport {
}
private ProblemReport(String table, ProblemType problemType, String
resource, byte enc[]) throws IOException {
+ArgumentChecker.notNull(table, problemType, resource);
this.tableName = table;
this.problemType = problemType;
this.resource = resource;
[09/11] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3bd456e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3bd456e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3bd456e
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: d3bd456e7e397f1a658f794b9d72f5eec50cf607
Parents: 3ce0bfd 334f7a7
Author: Bill Havanki
Authored: Thu Mar 27 17:21:45 2014 -0400
Committer: Bill Havanki
Committed: Thu Mar 27 17:21:45 2014 -0400
--
.../java/org/apache/accumulo/server/problems/ProblemReport.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3bd456e/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
--
diff --cc
server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
index fec4e55,000..decc995
mode 100644,00..100644
---
a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
@@@ -1,221 -1,0 +1,224 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.server.problems;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Map.Entry;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Value;
++import org.apache.accumulo.core.util.ArgumentChecker;
+import org.apache.accumulo.core.util.Encoding;
+import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy;
+import org.apache.accumulo.server.client.HdfsZooInstance;
+import org.apache.accumulo.server.security.SystemCredentials;
+import org.apache.accumulo.server.util.MetadataTableUtil;
+import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
+import org.apache.hadoop.io.Text;
+
+public class ProblemReport {
+ private String tableName;
+ private ProblemType problemType;
+ private String resource;
+ private String exception;
+ private String server;
+ private long creationTime;
+
+ public ProblemReport(String table, ProblemType problemType, String
resource, String server, Throwable e) {
++ArgumentChecker.notNull(table, problemType, resource);
+this.tableName = table;
+
+this.problemType = problemType;
+this.resource = resource;
+
+if (e != null) {
+ this.exception = e.getMessage();
+}
+
+if (server == null) {
+ try {
+server = InetAddress.getLocalHost().getHostAddress();
+ } catch (UnknownHostException e1) {
+
+ }
+}
+
+this.server = server;
+this.creationTime = System.currentTimeMillis();
+ }
+
+ public ProblemReport(String table, ProblemType problemType, String
resource, Throwable e) {
+this(table, problemType, resource, null, e);
+ }
+
+ private ProblemReport(String table, ProblemType problemType, String
resource, byte enc[]) throws IOException {
++ArgumentChecker.notNull(table, problemType, resource);
+this.tableName = table;
+this.problemType = problemType;
+this.resource = resource;
+
+decode(enc);
+ }
+
+ private byte[] encode() throws IOException {
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+DataOutputStream dos = new DataOutputStream(baos);
+
+dos.writeLong(creationTime);
+
+dos.writeBoolean(server != null);
+if (server != null) {
+ dos.writeUTF(server);
+}
+
+dos.wri
svn commit: r903960 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/
Author: bhavanki Date: Thu Mar 27 21:11:31 2014 New Revision: 903960 Log: Publishing svnmucc operation to accumulo site by bhavanki Added: websites/production/accumulo/content/ - copied from r903959, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r903959, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r903959, websites/production/accumulo/content/1.5/apidocs/
svn commit: r903959 - in /websites/staging/accumulo/trunk/content: ./ bylaws.html
Author: buildbot Date: Thu Mar 27 21:11:10 2014 New Revision: 903959 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/bylaws.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Thu Mar 27 21:11:10 2014 @@ -1 +1 @@ -1582400 +1582476 Modified: websites/staging/accumulo/trunk/content/bylaws.html == --- websites/staging/accumulo/trunk/content/bylaws.html (original) +++ websites/staging/accumulo/trunk/content/bylaws.html Thu Mar 27 21:11:10 2014 @@ -127,7 +127,6 @@ stability, and robustness of both code a Maintaining the project's shared resources, including the code repository, mailing lists, and websites. Protecting and ensuring proper use of Apache trademarks by the project and by other parties. Speaking on behalf of the project. -Resolving license disputes regarding products of the project. Nominating new PMC members and committers. Maintaining these bylaws and other guidelines of the project.
svn commit: r1582476 - /accumulo/site/trunk/content/bylaws.mdtext
Author: bhavanki Date: Thu Mar 27 21:11:00 2014 New Revision: 1582476 URL: http://svn.apache.org/r1582476 Log: Remove "Resolving license disputes" from PMC responsibility list, unclear meaning Modified: accumulo/site/trunk/content/bylaws.mdtext Modified: accumulo/site/trunk/content/bylaws.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/bylaws.mdtext?rev=1582476&r1=1582475&r2=1582476&view=diff == --- accumulo/site/trunk/content/bylaws.mdtext (original) +++ accumulo/site/trunk/content/bylaws.mdtext Thu Mar 27 21:11:00 2014 @@ -73,7 +73,6 @@ The responsibilities of the PMC include: * Maintaining the project's shared resources, including the code repository, mailing lists, and websites. * Protecting and ensuring proper use of Apache trademarks by the project and by other parties. * Speaking on behalf of the project. -* Resolving license disputes regarding products of the project. * Nominating new PMC members and committers. * Maintaining these bylaws and other guidelines of the project.
[2/3] git commit: ACCUMULO-2453 Forgot to remove dependency from the default
ACCUMULO-2453 Forgot to remove dependency from the default Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ce0bfda Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ce0bfda Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ce0bfda Branch: refs/heads/master Commit: 3ce0bfda3475f6a0e320b1af3e52c545b699d636 Parents: 3346019 Author: Josh Elser Authored: Thu Mar 27 13:32:23 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 13:32:23 2014 -0700 -- test/pom.xml | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ce0bfda/test/pom.xml -- diff --git a/test/pom.xml b/test/pom.xml index 7f06062..50a2f70 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -275,11 +275,6 @@ - commons-httpclient - commons-httpclient - test - - org.apache.hadoop hadoop-distcp test
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c935b12 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c935b12 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c935b12 Branch: refs/heads/master Commit: 3c935b129c8bdaa3a984c21791b07914d929442a Parents: a194423 3ce0bfd Author: Josh Elser Authored: Thu Mar 27 13:32:51 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 13:32:51 2014 -0700 -- test/pom.xml | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c935b12/test/pom.xml --
[1/3] git commit: ACCUMULO-2453 Forgot to remove dependency from the default
Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT 334601992 -> 3ce0bfda3 refs/heads/master a194423d9 -> 3c935b129 ACCUMULO-2453 Forgot to remove dependency from the default Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ce0bfda Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ce0bfda Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ce0bfda Branch: refs/heads/1.6.0-SNAPSHOT Commit: 3ce0bfda3475f6a0e320b1af3e52c545b699d636 Parents: 3346019 Author: Josh Elser Authored: Thu Mar 27 13:32:23 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 13:32:23 2014 -0700 -- test/pom.xml | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ce0bfda/test/pom.xml -- diff --git a/test/pom.xml b/test/pom.xml index 7f06062..50a2f70 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -275,11 +275,6 @@ - commons-httpclient - commons-httpclient - test - - org.apache.hadoop hadoop-distcp test
[9/9] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a194423d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a194423d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a194423d Branch: refs/heads/master Commit: a194423d99bfc48543946e97c9da462489d0dc27 Parents: 86ed88a 3346019 Author: Josh Elser Authored: Thu Mar 27 13:27:01 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 13:27:01 2014 -0700 -- test/pom.xml | 10 ++ .../test/java/org/apache/accumulo/test/ShellServerIT.java | 9 + 2 files changed, 15 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194423d/test/pom.xml --
[8/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/33460199 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33460199 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/33460199 Branch: refs/heads/master Commit: 33460199242f1c50bc16136d8b14e6497219da63 Parents: 40299f8 4a05a17 Author: Josh Elser Authored: Thu Mar 27 13:26:52 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 13:26:52 2014 -0700 -- test/pom.xml | 10 ++ .../test/java/org/apache/accumulo/test/ShellServerIT.java | 9 + 2 files changed, 15 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/33460199/test/pom.xml -- diff --cc test/pom.xml index 901baa3,ad60054..7f06062 --- a/test/pom.xml +++ b/test/pom.xml @@@ -275,8 -142,13 +275,13 @@@ + commons-httpclient + commons-httpclient + test + + org.apache.hadoop - hadoop-tools + hadoop-distcp test http://git-wip-us.apache.org/repos/asf/accumulo/blob/33460199/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index 87cd069,000..02fa104 mode 100644,00..100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java @@@ -1,1251 -1,0 +1,1252 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import jline.console.ConsoleReader; + +import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.TableNotFoundException; +import org.apache.accumulo.core.client.admin.TableOperations; +import org.apache.accumulo.core.client.impl.Namespaces; +import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.file.FileOperations; +import org.apache.accumulo.core.file.FileSKVWriter; +import org.apache.accumulo.core.metadata.MetadataTable; +import org.apache.accumulo.core.metadata.RootTable; +import org.apache.accumulo.core.security.Authorizations; +import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.core.util.shell.Shell; +import org.apache.accumulo.test.functional.FunctionalTestUtils; +import org.apache.accumulo.test.functional.SimpleMacIT; +import org.apache.accumulo.tracer.TraceServer; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.io.Text; +import org.apache.hadoop.tools.DistCp; +import org.apache.log4j.Logger; +import org.junit.After; +import org.junit.AfterClass; +import or
[4/9] git commit: ACCUMULO-2453 Add in commons-httpclient test dependency
ACCUMULO-2453 Add in commons-httpclient test dependency Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a05a17d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a05a17d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4a05a17d Branch: refs/heads/1.5.2-SNAPSHOT Commit: 4a05a17deb36924a126c3e04894fb34b65910565 Parents: c1964b2 Author: Josh Elser Authored: Thu Mar 27 13:04:31 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 13:04:31 2014 -0700 -- test/pom.xml | 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a05a17d/test/pom.xml -- diff --git a/test/pom.xml b/test/pom.xml index bf0a3f8..ad60054 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -142,6 +142,11 @@ + commons-httpclient + commons-httpclient + test + + org.apache.hadoop hadoop-tools test @@ -161,6 +166,11 @@ + commons-httpclient + commons-httpclient + test + + org.apache.hadoop hadoop-tools test
[2/9] git commit: ACCUMULO-2433 Try to stabilize listscans on ShellServerTest
ACCUMULO-2433 Try to stabilize listscans on ShellServerTest
Remove the ZKI and Connector timing from the 5s that we used to look
for the slow scan that was running. Increase the amount of time inbetween
calls to listscans.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c1964b27
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c1964b27
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c1964b27
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: c1964b27fb7d9fed9b5f68f66ca7532f7964cdd6
Parents: 7ec60f1
Author: Josh Elser
Authored: Thu Mar 27 12:41:34 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 12:41:34 2014 -0700
--
.../java/org/apache/accumulo/test/ShellServerTest.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c1964b27/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 9b2ab33..7bda585 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -818,12 +818,15 @@ public class ShellServerTest {
}
exec("config -t " + table + " -s
table.iterator.scan.slow=30,org.apache.accumulo.test.functional.SlowIterator",
true);
exec("config -t " + table + " -s
table.iterator.scan.slow.opt.sleepTime=500", true);
+
+
+ZooKeeperInstance instance = new
ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
+Connector connector = instance.getConnector("root", new
PasswordToken(secret));
+final Scanner s = connector.createScanner(table, Constants.NO_AUTHS);
+
Thread thread = new Thread() {
public void run() {
try {
- ZooKeeperInstance instance = new
ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
- Connector connector = instance.getConnector("root", new
PasswordToken(secret));
- Scanner s = connector.createScanner(table, Constants.NO_AUTHS);
for (@SuppressWarnings("unused")
Entry kv : s)
;
@@ -835,7 +838,7 @@ public class ShellServerTest {
thread.start();
List scans = new ArrayList();
-// Try to find the active scan for about 5seconds
+// Try to find the active scan for about 15seconds
for (int i = 0; i < 50 && scans.isEmpty(); i++) {
String currentScans = exec("listscans", true);
String[] lines = currentScans.split("\n");
@@ -845,7 +848,7 @@ public class ShellServerTest {
scans.add(currentScan);
}
}
- UtilWaitThread.sleep(100);
+ UtilWaitThread.sleep(300);
}
thread.join();
[3/9] git commit: ACCUMULO-2433 Try to stabilize listscans on ShellServerTest
ACCUMULO-2433 Try to stabilize listscans on ShellServerTest
Remove the ZKI and Connector timing from the 5s that we used to look
for the slow scan that was running. Increase the amount of time inbetween
calls to listscans.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c1964b27
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c1964b27
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c1964b27
Branch: refs/heads/master
Commit: c1964b27fb7d9fed9b5f68f66ca7532f7964cdd6
Parents: 7ec60f1
Author: Josh Elser
Authored: Thu Mar 27 12:41:34 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 12:41:34 2014 -0700
--
.../java/org/apache/accumulo/test/ShellServerTest.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c1964b27/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 9b2ab33..7bda585 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -818,12 +818,15 @@ public class ShellServerTest {
}
exec("config -t " + table + " -s
table.iterator.scan.slow=30,org.apache.accumulo.test.functional.SlowIterator",
true);
exec("config -t " + table + " -s
table.iterator.scan.slow.opt.sleepTime=500", true);
+
+
+ZooKeeperInstance instance = new
ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
+Connector connector = instance.getConnector("root", new
PasswordToken(secret));
+final Scanner s = connector.createScanner(table, Constants.NO_AUTHS);
+
Thread thread = new Thread() {
public void run() {
try {
- ZooKeeperInstance instance = new
ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
- Connector connector = instance.getConnector("root", new
PasswordToken(secret));
- Scanner s = connector.createScanner(table, Constants.NO_AUTHS);
for (@SuppressWarnings("unused")
Entry kv : s)
;
@@ -835,7 +838,7 @@ public class ShellServerTest {
thread.start();
List scans = new ArrayList();
-// Try to find the active scan for about 5seconds
+// Try to find the active scan for about 15seconds
for (int i = 0; i < 50 && scans.isEmpty(); i++) {
String currentScans = exec("listscans", true);
String[] lines = currentScans.split("\n");
@@ -845,7 +848,7 @@ public class ShellServerTest {
scans.add(currentScan);
}
}
- UtilWaitThread.sleep(100);
+ UtilWaitThread.sleep(300);
}
thread.join();
[6/9] git commit: ACCUMULO-2453 Add in commons-httpclient test dependency
ACCUMULO-2453 Add in commons-httpclient test dependency Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a05a17d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a05a17d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4a05a17d Branch: refs/heads/master Commit: 4a05a17deb36924a126c3e04894fb34b65910565 Parents: c1964b2 Author: Josh Elser Authored: Thu Mar 27 13:04:31 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 13:04:31 2014 -0700 -- test/pom.xml | 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a05a17d/test/pom.xml -- diff --git a/test/pom.xml b/test/pom.xml index bf0a3f8..ad60054 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -142,6 +142,11 @@ + commons-httpclient + commons-httpclient + test + + org.apache.hadoop hadoop-tools test @@ -161,6 +166,11 @@ + commons-httpclient + commons-httpclient + test + + org.apache.hadoop hadoop-tools test
[7/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/33460199 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33460199 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/33460199 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 33460199242f1c50bc16136d8b14e6497219da63 Parents: 40299f8 4a05a17 Author: Josh Elser Authored: Thu Mar 27 13:26:52 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 13:26:52 2014 -0700 -- test/pom.xml | 10 ++ .../test/java/org/apache/accumulo/test/ShellServerIT.java | 9 + 2 files changed, 15 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/33460199/test/pom.xml -- diff --cc test/pom.xml index 901baa3,ad60054..7f06062 --- a/test/pom.xml +++ b/test/pom.xml @@@ -275,8 -142,13 +275,13 @@@ + commons-httpclient + commons-httpclient + test + + org.apache.hadoop - hadoop-tools + hadoop-distcp test http://git-wip-us.apache.org/repos/asf/accumulo/blob/33460199/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java -- diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index 87cd069,000..02fa104 mode 100644,00..100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java @@@ -1,1251 -1,0 +1,1252 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import jline.console.ConsoleReader; + +import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.TableNotFoundException; +import org.apache.accumulo.core.client.admin.TableOperations; +import org.apache.accumulo.core.client.impl.Namespaces; +import org.apache.accumulo.core.conf.AccumuloConfiguration; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.file.FileOperations; +import org.apache.accumulo.core.file.FileSKVWriter; +import org.apache.accumulo.core.metadata.MetadataTable; +import org.apache.accumulo.core.metadata.RootTable; +import org.apache.accumulo.core.security.Authorizations; +import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.core.util.shell.Shell; +import org.apache.accumulo.test.functional.FunctionalTestUtils; +import org.apache.accumulo.test.functional.SimpleMacIT; +import org.apache.accumulo.tracer.TraceServer; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.io.Text; +import org.apache.hadoop.tools.DistCp; +import org.apache.log4j.Logger; +import org.junit.After; +import org.junit.AfterClass; +i
[1/9] git commit: ACCUMULO-2433 Try to stabilize listscans on ShellServerTest
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 7ec60f1bc -> 4a05a17de
refs/heads/1.6.0-SNAPSHOT 40299f89a -> 334601992
refs/heads/master 86ed88a16 -> a194423d9
ACCUMULO-2433 Try to stabilize listscans on ShellServerTest
Remove the ZKI and Connector timing from the 5s that we used to look
for the slow scan that was running. Increase the amount of time inbetween
calls to listscans.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c1964b27
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c1964b27
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c1964b27
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: c1964b27fb7d9fed9b5f68f66ca7532f7964cdd6
Parents: 7ec60f1
Author: Josh Elser
Authored: Thu Mar 27 12:41:34 2014 -0700
Committer: Josh Elser
Committed: Thu Mar 27 12:41:34 2014 -0700
--
.../java/org/apache/accumulo/test/ShellServerTest.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c1964b27/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 9b2ab33..7bda585 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -818,12 +818,15 @@ public class ShellServerTest {
}
exec("config -t " + table + " -s
table.iterator.scan.slow=30,org.apache.accumulo.test.functional.SlowIterator",
true);
exec("config -t " + table + " -s
table.iterator.scan.slow.opt.sleepTime=500", true);
+
+
+ZooKeeperInstance instance = new
ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
+Connector connector = instance.getConnector("root", new
PasswordToken(secret));
+final Scanner s = connector.createScanner(table, Constants.NO_AUTHS);
+
Thread thread = new Thread() {
public void run() {
try {
- ZooKeeperInstance instance = new
ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers());
- Connector connector = instance.getConnector("root", new
PasswordToken(secret));
- Scanner s = connector.createScanner(table, Constants.NO_AUTHS);
for (@SuppressWarnings("unused")
Entry kv : s)
;
@@ -835,7 +838,7 @@ public class ShellServerTest {
thread.start();
List scans = new ArrayList();
-// Try to find the active scan for about 5seconds
+// Try to find the active scan for about 15seconds
for (int i = 0; i < 50 && scans.isEmpty(); i++) {
String currentScans = exec("listscans", true);
String[] lines = currentScans.split("\n");
@@ -845,7 +848,7 @@ public class ShellServerTest {
scans.add(currentScan);
}
}
- UtilWaitThread.sleep(100);
+ UtilWaitThread.sleep(300);
}
thread.join();
[5/9] git commit: ACCUMULO-2453 Add in commons-httpclient test dependency
ACCUMULO-2453 Add in commons-httpclient test dependency Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a05a17d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a05a17d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4a05a17d Branch: refs/heads/1.6.0-SNAPSHOT Commit: 4a05a17deb36924a126c3e04894fb34b65910565 Parents: c1964b2 Author: Josh Elser Authored: Thu Mar 27 13:04:31 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 13:04:31 2014 -0700 -- test/pom.xml | 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a05a17d/test/pom.xml -- diff --git a/test/pom.xml b/test/pom.xml index bf0a3f8..ad60054 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -142,6 +142,11 @@ + commons-httpclient + commons-httpclient + test + + org.apache.hadoop hadoop-tools test @@ -161,6 +166,11 @@ + commons-httpclient + commons-httpclient + test + + org.apache.hadoop hadoop-tools test
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Conflicts:
core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/86ed88a1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/86ed88a1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/86ed88a1
Branch: refs/heads/master
Commit: 86ed88a169c14e7fc9c673804ee6240e07a02336
Parents: 2849cbd 40299f8
Author: Christopher Tubbs
Authored: Thu Mar 27 15:06:10 2014 -0400
Committer: Christopher Tubbs
Committed: Thu Mar 27 15:06:10 2014 -0400
--
.../accumulo/core/conf/ConfigurationDocGen.java | 341 +++
.../core/conf/DefaultConfiguration.java | 131 +--
.../org/apache/accumulo/core/conf/Property.java | 135
.../apache/accumulo/core/conf/PropertyType.java | 66 ++--
.../accumulo/core/conf/config-header.html | 90 +
.../apache/accumulo/core/conf/config-header.tex | 99 ++
.../org/apache/accumulo/core/conf/config.html | 90 -
.../apache/accumulo/core/conf/PropertyTest.java | 49 +--
docs/pom.xml| 41 +++
.../accumulo_user_manual.tex| 8 +-
.../chapters/administration.tex | 70 ++--
.../accumulo_user_manual/chapters/analytics.tex | 88 ++---
.../accumulo_user_manual/chapters/clients.tex | 92 ++---
.../chapters/development_clients.tex| 44 +--
.../chapters/high_speed_ingest.tex | 18 +-
.../chapters/multivolume.tex| 12 +-
.../accumulo_user_manual/chapters/security.tex | 30 +-
.../accumulo_user_manual/chapters/shell.tex | 43 +--
.../chapters/table_configuration.tex| 219 +---
.../chapters/table_design.tex | 60 ++--
.../chapters/troubleshooting.tex| 215 ++--
.../impl/MiniAccumuloConfigImpl.java| 6 +-
.../accumulo/monitor/servlets/trace/Basic.java | 2 +-
.../org/apache/accumulo/tracer/TraceServer.java | 58 ++--
.../classloader/vfs/AccumuloVFSClassLoader.java | 115 +++
25 files changed, 1152 insertions(+), 970 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/86ed88a1/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
--
diff --cc
core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
index a98d794,030e88a..843d126
--- a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
@@@ -24,27 -22,13 +22,23 @@@ import java.io.UnsupportedEncodingExcep
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
- import java.util.TreeMap;
import org.apache.accumulo.core.Constants;
- import org.apache.log4j.Logger;
+/**
+ * An {@link AccumuloConfiguration} that contains only default values for
+ * properties. This class is a singleton.
+ */
public class DefaultConfiguration extends AccumuloConfiguration {
private static DefaultConfiguration instance = null;
- private static Logger log = Logger.getLogger(DefaultConfiguration.class);
private Map resolvedProps = null;
+ /**
+ * Gets an instance of this class.
+ *
+ * @return default configuration
+ * @throws RuntimeException if the default configuration is invalid
+ */
synchronized public static DefaultConfiguration getInstance() {
if (instance == null) {
instance = new DefaultConfiguration();
@@@ -76,128 -60,11 +70,13 @@@
props.put(entry.getKey(), entry.getValue());
}
- /*
- * Used by the monitor to show configuration properties
+ /**
-* Generates HTML documentation on the default configuration.
++ * Generates HTML documentation on the default configuration. Used by the
monitor to show configuration properties.
+ *
+ * @param doc stream to write HTML to
*/
protected static void generateDocumentation(PrintStream doc) {
- // read static content from resources and output
- InputStream data =
DefaultConfiguration.class.getResourceAsStream("config.html");
- if (data != null) {
- byte[] buffer = new byte[1024];
- int n;
- try {
- while ((n = data.read(buffer)) > 0)
- doc.print(new String(buffer, 0, n, Constants.UTF8));
- } catch (IOException e) {
- e.printStackTrace();
- return;
- } finally {
- try {
- data.close();
- } catch (IOException ex) {
- log.error(ex, ex);
- }
- }
- }
- doc.println();
-
- ArrayLi
[1/4] ACCUMULO-1517 Generate LaTeX appendix for config
Repository: accumulo
Updated Branches:
refs/heads/master 2849cbd8e -> 86ed88a16
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40299f89/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index b2de7db..897b55b 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -99,7 +99,7 @@ public class MiniAccumuloConfigImpl {
logDir = new File(dir, "logs");
walogDir = new File(dir, "walogs");
- // TODO ACCUMULO- replace usage of instance.dfs.{dir,uri} with
instance.volumes
+ // TODO ACCUMULO- replace usage of instance.dfs.{dir,uri} with
instance.volumes
setInstanceLocation();
mergeProp(Property.INSTANCE_SECRET.getKey(), DEFAULT_INSTANCE_SECRET);
@@ -110,7 +110,7 @@ public class MiniAccumuloConfigImpl {
mergeProp(Property.TSERV_MAXMEM.getKey(), "50M");
mergeProp(Property.TSERV_WALOG_MAX_SIZE.getKey(), "100M");
mergeProp(Property.TSERV_NATIVEMAP_ENABLED.getKey(), "false");
- mergeProp(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey() + ".password",
getRootPassword());
+ mergeProp(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey() + "password",
getRootPassword());
// since there is a small amount of memory, check more frequently for
majc... setting may not be needed in 1.5
mergeProp(Property.TSERV_MAJC_DELAY.getKey(), "3");
mergeProp(Property.GENERAL_CLASSPATHS.getKey(), libDir.getAbsolutePath()
+ "/[^.].*[.]jar");
@@ -389,7 +389,7 @@ public class MiniAccumuloConfigImpl {
public File getClientConfFile() {
return new File(getConfDir(), "client.conf");
}
-
+
/**
* sets system properties set for service processes
*
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40299f89/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
--
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
index 31a8f0f..90bb0d4 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
@@ -77,7 +77,7 @@ abstract class Basic extends BasicServlet {
at = new PasswordToken(conf.get(p).getBytes(Constants.UTF8));
} else {
Properties props = new Properties();
- int prefixLength =
Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey().length() + 1;
+ int prefixLength =
Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey().length();
for (Entry entry : loginMap.entrySet()) {
props.put(entry.getKey().substring(prefixLength), entry.getValue());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40299f89/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
--
diff --git
a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 30f1ae7..67f2739 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -30,10 +30,10 @@ import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import
org.apache.accumulo.core.client.security.tokens.AuthenticationToken.Properties;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Mutation;
@@ -74,51 +74,51 @@ import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.Watcher.Event.KeeperState;
public class TraceServer implements Watcher {
-
+
final private static Logger log = Logger.getLogger(TraceServer.class);
final private ServerConfiguration serverConfiguration;
final private TServer server;
final private AtomicReference writer;
final private Connector connector;
final String table;
-
[1/3] ACCUMULO-1517 Generate LaTeX appendix for config
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT a8572fe57 -> 40299f89a
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40299f89/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index b2de7db..897b55b 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -99,7 +99,7 @@ public class MiniAccumuloConfigImpl {
logDir = new File(dir, "logs");
walogDir = new File(dir, "walogs");
- // TODO ACCUMULO- replace usage of instance.dfs.{dir,uri} with
instance.volumes
+ // TODO ACCUMULO- replace usage of instance.dfs.{dir,uri} with
instance.volumes
setInstanceLocation();
mergeProp(Property.INSTANCE_SECRET.getKey(), DEFAULT_INSTANCE_SECRET);
@@ -110,7 +110,7 @@ public class MiniAccumuloConfigImpl {
mergeProp(Property.TSERV_MAXMEM.getKey(), "50M");
mergeProp(Property.TSERV_WALOG_MAX_SIZE.getKey(), "100M");
mergeProp(Property.TSERV_NATIVEMAP_ENABLED.getKey(), "false");
- mergeProp(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey() + ".password",
getRootPassword());
+ mergeProp(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey() + "password",
getRootPassword());
// since there is a small amount of memory, check more frequently for
majc... setting may not be needed in 1.5
mergeProp(Property.TSERV_MAJC_DELAY.getKey(), "3");
mergeProp(Property.GENERAL_CLASSPATHS.getKey(), libDir.getAbsolutePath()
+ "/[^.].*[.]jar");
@@ -389,7 +389,7 @@ public class MiniAccumuloConfigImpl {
public File getClientConfFile() {
return new File(getConfDir(), "client.conf");
}
-
+
/**
* sets system properties set for service processes
*
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40299f89/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
--
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
index 31a8f0f..90bb0d4 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java
@@ -77,7 +77,7 @@ abstract class Basic extends BasicServlet {
at = new PasswordToken(conf.get(p).getBytes(Constants.UTF8));
} else {
Properties props = new Properties();
- int prefixLength =
Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey().length() + 1;
+ int prefixLength =
Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey().length();
for (Entry entry : loginMap.entrySet()) {
props.put(entry.getKey().substring(prefixLength), entry.getValue());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40299f89/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
--
diff --git
a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 30f1ae7..67f2739 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -30,10 +30,10 @@ import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import
org.apache.accumulo.core.client.security.tokens.AuthenticationToken.Properties;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Mutation;
@@ -74,51 +74,51 @@ import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.Watcher.Event.KeeperState;
public class TraceServer implements Watcher {
-
+
final private static Logger log = Logger.getLogger(TraceServer.class);
final private ServerConfiguration serverConfiguration;
final private TServer server;
final private AtomicReference writer;
final private Connector connector;
final String
svn commit: r903940 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/
Author: busbey Date: Thu Mar 27 17:04:37 2014 New Revision: 903940 Log: Publishing svnmucc operation to accumulo site by busbey Added: websites/production/accumulo/content/ - copied from r903939, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r903939, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r903939, websites/production/accumulo/content/1.5/apidocs/
svn commit: r903939 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot
Date: Thu Mar 27 17:00:13 2014
New Revision: 903939
Log:
Staging update by buildbot for accumulo
Modified:
websites/staging/accumulo/trunk/content/ (props changed)
websites/staging/accumulo/trunk/content/people.html
Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar 27 17:00:13 2014
@@ -1 +1 @@
-1581991
+1582400
Modified: websites/staging/accumulo/trunk/content/people.html
==
--- websites/staging/accumulo/trunk/content/people.html (original)
+++ websites/staging/accumulo/trunk/content/people.html Thu Mar 27 17:00:13 2014
@@ -148,6 +148,7 @@ tr:nth-child(2n+1) {
Aaron Glahehttp://www.data-tactics.com/>Data TaticsET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
Al KrinkerET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
Alex Moundalexishttp://www.cloudera.com";>ClouderaET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
+ Andrew George Wellshttp://clearedgeit.com/";>ClearEdgeITET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
Arshak Navruzyanhttp://www.argyledata.com/";>Argyle Data
Chris Bennight
Chris McCubbinhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
@@ -177,7 +178,7 @@ tr:nth-child(2n+1) {
Michael Bermanhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
Michael Wall
Miguel Pereirahttp://sra.com";>SRA
International, IncET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
- faganmMike Faganhttp://www.arcus-research.com";>Arcus ResearchMT (http://www.timeanddate.com/library/abbreviations/timezones/na/mst.html";>-7
/ http://www.timeanddate.com/library/abbreviations/timezones/na/mdt.html";>-6)
+ Mike Faganhttp://www.arcus-research.com";>Arcus ResearchMT (http://www.timeanddate.com/library/abbreviations/timezones/na/mst.html";>-7
/ http://www.timeanddate.com/library/abbreviations/timezones/na/mdt.html";>-6)
Morgan Haskel
Nguessan Kouame
Oren Falkowitzhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5
/ http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
svn commit: r1582400 - /accumulo/site/trunk/content/people.mdtext
Author: busbey Date: Thu Mar 27 16:59:59 2014 New Revision: 1582400 URL: http://svn.apache.org/r1582400 Log: updated contributor list for ACCUMULO-1945 and ACCUMULO-2544 Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1582400&r1=1582399&r2=1582400&view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Thu Mar 27 16:59:59 2014 @@ -77,6 +77,7 @@ Contributors Aaron Glahehttp://www.data-tactics.com/>Data TaticsET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Al KrinkerET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Alex Moundalexishttp://www.cloudera.com";>ClouderaET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) + Andrew George Wellshttp://clearedgeit.com/";>ClearEdgeITET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Arshak Navruzyanhttp://www.argyledata.com/";>Argyle Data Chris Bennight Chris McCubbinhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) @@ -106,7 +107,7 @@ Contributors Michael Bermanhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Michael Wall Miguel Pereirahttp://sra.com";>SRA International, IncET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) - faganmMike Faganhttp://www.arcus-research.com";>Arcus ResearchMT (http://www.timeanddate.com/library/abbreviations/timezones/na/mst.html";>-7 / http://www.timeanddate.com/library/abbreviations/timezones/na/mdt.html";>-6) + Mike Faganhttp://www.arcus-research.com";>Arcus ResearchMT (http://www.timeanddate.com/library/abbreviations/timezones/na/mst.html";>-7 / http://www.timeanddate.com/library/abbreviations/timezones/na/mdt.html";>-6) Morgan Haskel Nguessan Kouame Oren Falkowitzhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4)
[2/6] git commit: ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be consistent with actual accumulo instance
ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be
consistent with actual accumulo instance
Signed-off-by: Sean Busbey
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ec60f1b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7ec60f1b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7ec60f1b
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7ec60f1bcac4c274653d2779f1996138f3a275b7
Parents: 72c9af4
Author: Michael Fagan
Authored: Tue Mar 25 14:58:37 2014 -0600
Committer: Sean Busbey
Committed: Thu Mar 27 11:42:39 2014 -0500
--
.../accumulo/core/client/mock/MockTableOperations.java | 12
.../core/client/mock/MockTableOperationsTest.java | 6 +-
2 files changed, 13 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7ec60f1b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
index f088b1f..dc4a619 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
@@ -55,9 +55,9 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
public class MockTableOperations extends TableOperationsHelper {
-
- final private MockAccumulo acu;
- final private String username;
+ private static final byte[] ZERO = {0};
+ private final MockAccumulo acu;
+ private final String username;
MockTableOperations(MockAccumulo acu, String username) {
this.acu = acu;
@@ -314,7 +314,11 @@ public class MockTableOperations extends
TableOperationsHelper {
if (!exists(tableName))
throw new TableNotFoundException(tableName, tableName, "");
MockTable t = acu.tables.get(tableName);
-Set keep = new TreeSet(t.table.tailMap(new
Key(start)).headMap(new Key(end)).keySet());
+Text startText = new Text(start);
+Text endText = new Text(end);
+startText.append(ZERO, 0, 1);
+endText.append(ZERO, 0, 1);
+Set keep = new TreeSet(t.table.subMap(new Key(startText), new
Key(endText)).keySet());
t.table.keySet().removeAll(keep);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7ec60f1b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
index da361b0..e377884 100644
---
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
@@ -267,9 +267,13 @@ public class MockTableOperationsTest {
bw.flush();
to.deleteRows("test", new Text("1"), new Text("2"));
Scanner s = connector.createScanner("test", Constants.NO_AUTHS);
+int oneCnt = 0;
for (Entry entry : s) {
- Assert.assertTrue(entry.getKey().getRow().toString().charAt(0) != '1');
+ char rowStart = entry.getKey().getRow().toString().charAt(0);
+ Assert.assertTrue(rowStart != '2');
+ oneCnt += rowStart == '1' ? 1 : 0;
}
+Assert.assertEquals(5, oneCnt);
}
}
[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2849cbd8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2849cbd8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2849cbd8 Branch: refs/heads/master Commit: 2849cbd8e25f87691788c6cee8bbea0ffa2155fb Parents: 8485134 a8572fe Author: Sean Busbey Authored: Thu Mar 27 11:58:19 2014 -0500 Committer: Sean Busbey Committed: Thu Mar 27 11:58:19 2014 -0500 -- .../accumulo/core/client/mock/MockTableOperations.java | 12 .../core/client/mock/MockTableOperationsTest.java | 6 +- 2 files changed, 13 insertions(+), 5 deletions(-) --
[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8572fe5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8572fe5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a8572fe5
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a8572fe57690831b29b724c67f162857e9297577
Parents: 5d030ca 7ec60f1
Author: Sean Busbey
Authored: Thu Mar 27 11:51:45 2014 -0500
Committer: Sean Busbey
Committed: Thu Mar 27 11:51:45 2014 -0500
--
.../accumulo/core/client/mock/MockTableOperations.java | 12
.../core/client/mock/MockTableOperationsTest.java | 6 +-
2 files changed, 13 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8572fe5/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8572fe5/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
--
diff --cc
core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
index 216b3ba,e377884..94dbed1
---
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
@@@ -266,10 -266,14 +266,14 @@@ public class MockTableOperationsTest
}
bw.flush();
to.deleteRows("test", new Text("1"), new Text("2"));
-Scanner s = connector.createScanner("test", Constants.NO_AUTHS);
+Scanner s = connector.createScanner("test", Authorizations.EMPTY);
+ int oneCnt = 0;
for (Entry entry : s) {
- Assert.assertTrue(entry.getKey().getRow().toString().charAt(0) != '1');
+ char rowStart = entry.getKey().getRow().toString().charAt(0);
+ Assert.assertTrue(rowStart != '2');
+ oneCnt += rowStart == '1' ? 1 : 0;
}
+ Assert.assertEquals(5, oneCnt);
}
-
+
}
[1/6] git commit: ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be consistent with actual accumulo instance
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 72c9af4c6 -> 7ec60f1bc
refs/heads/1.6.0-SNAPSHOT 5d030cae9 -> a8572fe57
refs/heads/master 8485134d7 -> 2849cbd8e
ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be
consistent with actual accumulo instance
Signed-off-by: Sean Busbey
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ec60f1b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7ec60f1b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7ec60f1b
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 7ec60f1bcac4c274653d2779f1996138f3a275b7
Parents: 72c9af4
Author: Michael Fagan
Authored: Tue Mar 25 14:58:37 2014 -0600
Committer: Sean Busbey
Committed: Thu Mar 27 11:42:39 2014 -0500
--
.../accumulo/core/client/mock/MockTableOperations.java | 12
.../core/client/mock/MockTableOperationsTest.java | 6 +-
2 files changed, 13 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7ec60f1b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
index f088b1f..dc4a619 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
@@ -55,9 +55,9 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
public class MockTableOperations extends TableOperationsHelper {
-
- final private MockAccumulo acu;
- final private String username;
+ private static final byte[] ZERO = {0};
+ private final MockAccumulo acu;
+ private final String username;
MockTableOperations(MockAccumulo acu, String username) {
this.acu = acu;
@@ -314,7 +314,11 @@ public class MockTableOperations extends
TableOperationsHelper {
if (!exists(tableName))
throw new TableNotFoundException(tableName, tableName, "");
MockTable t = acu.tables.get(tableName);
-Set keep = new TreeSet(t.table.tailMap(new
Key(start)).headMap(new Key(end)).keySet());
+Text startText = new Text(start);
+Text endText = new Text(end);
+startText.append(ZERO, 0, 1);
+endText.append(ZERO, 0, 1);
+Set keep = new TreeSet(t.table.subMap(new Key(startText), new
Key(endText)).keySet());
t.table.keySet().removeAll(keep);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7ec60f1b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
index da361b0..e377884 100644
---
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
@@ -267,9 +267,13 @@ public class MockTableOperationsTest {
bw.flush();
to.deleteRows("test", new Text("1"), new Text("2"));
Scanner s = connector.createScanner("test", Constants.NO_AUTHS);
+int oneCnt = 0;
for (Entry entry : s) {
- Assert.assertTrue(entry.getKey().getRow().toString().charAt(0) != '1');
+ char rowStart = entry.getKey().getRow().toString().charAt(0);
+ Assert.assertTrue(rowStart != '2');
+ oneCnt += rowStart == '1' ? 1 : 0;
}
+Assert.assertEquals(5, oneCnt);
}
}
[3/6] git commit: ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be consistent with actual accumulo instance
ACCUMULO-2544: Fix match boundaries for MockTableOperations.deleteRows to be
consistent with actual accumulo instance
Signed-off-by: Sean Busbey
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ec60f1b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7ec60f1b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7ec60f1b
Branch: refs/heads/master
Commit: 7ec60f1bcac4c274653d2779f1996138f3a275b7
Parents: 72c9af4
Author: Michael Fagan
Authored: Tue Mar 25 14:58:37 2014 -0600
Committer: Sean Busbey
Committed: Thu Mar 27 11:42:39 2014 -0500
--
.../accumulo/core/client/mock/MockTableOperations.java | 12
.../core/client/mock/MockTableOperationsTest.java | 6 +-
2 files changed, 13 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7ec60f1b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
index f088b1f..dc4a619 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
@@ -55,9 +55,9 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
public class MockTableOperations extends TableOperationsHelper {
-
- final private MockAccumulo acu;
- final private String username;
+ private static final byte[] ZERO = {0};
+ private final MockAccumulo acu;
+ private final String username;
MockTableOperations(MockAccumulo acu, String username) {
this.acu = acu;
@@ -314,7 +314,11 @@ public class MockTableOperations extends
TableOperationsHelper {
if (!exists(tableName))
throw new TableNotFoundException(tableName, tableName, "");
MockTable t = acu.tables.get(tableName);
-Set keep = new TreeSet(t.table.tailMap(new
Key(start)).headMap(new Key(end)).keySet());
+Text startText = new Text(start);
+Text endText = new Text(end);
+startText.append(ZERO, 0, 1);
+endText.append(ZERO, 0, 1);
+Set keep = new TreeSet(t.table.subMap(new Key(startText), new
Key(endText)).keySet());
t.table.keySet().removeAll(keep);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7ec60f1b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
index da361b0..e377884 100644
---
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
@@ -267,9 +267,13 @@ public class MockTableOperationsTest {
bw.flush();
to.deleteRows("test", new Text("1"), new Text("2"));
Scanner s = connector.createScanner("test", Constants.NO_AUTHS);
+int oneCnt = 0;
for (Entry entry : s) {
- Assert.assertTrue(entry.getKey().getRow().toString().charAt(0) != '1');
+ char rowStart = entry.getKey().getRow().toString().charAt(0);
+ Assert.assertTrue(rowStart != '2');
+ oneCnt += rowStart == '1' ? 1 : 0;
}
+Assert.assertEquals(5, oneCnt);
}
}
[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8572fe5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8572fe5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a8572fe5
Branch: refs/heads/master
Commit: a8572fe57690831b29b724c67f162857e9297577
Parents: 5d030ca 7ec60f1
Author: Sean Busbey
Authored: Thu Mar 27 11:51:45 2014 -0500
Committer: Sean Busbey
Committed: Thu Mar 27 11:51:45 2014 -0500
--
.../accumulo/core/client/mock/MockTableOperations.java | 12
.../core/client/mock/MockTableOperationsTest.java | 6 +-
2 files changed, 13 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8572fe5/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8572fe5/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
--
diff --cc
core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
index 216b3ba,e377884..94dbed1
---
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
@@@ -266,10 -266,14 +266,14 @@@ public class MockTableOperationsTest
}
bw.flush();
to.deleteRows("test", new Text("1"), new Text("2"));
-Scanner s = connector.createScanner("test", Constants.NO_AUTHS);
+Scanner s = connector.createScanner("test", Authorizations.EMPTY);
+ int oneCnt = 0;
for (Entry entry : s) {
- Assert.assertTrue(entry.getKey().getRow().toString().charAt(0) != '1');
+ char rowStart = entry.getKey().getRow().toString().charAt(0);
+ Assert.assertTrue(rowStart != '2');
+ oneCnt += rowStart == '1' ? 1 : 0;
}
+ Assert.assertEquals(5, oneCnt);
}
-
+
}
[2/4] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' 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/72c9af4c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72c9af4c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72c9af4c Branch: refs/heads/master Commit: 72c9af4c6b331edd87343be33a433a0b2cfcbc68 Parents: 1140d00 4619101 Author: Keith Turner Authored: Thu Mar 27 12:37:40 2014 -0400 Committer: Keith Turner Committed: Thu Mar 27 12:37:40 2014 -0400 -- .../java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/72c9af4c/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java -- diff --cc server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java index 0b7ff0f,000..9551fe3 mode 100644,00..100644 --- a/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java +++ b/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java @@@ -1,813 -1,0 +1,813 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.server.gc; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.regex.Pattern; + +import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.cli.Help; +import org.apache.accumulo.core.client.AccumuloException; +import org.apache.accumulo.core.client.AccumuloSecurityException; +import org.apache.accumulo.core.client.BatchWriter; +import org.apache.accumulo.core.client.BatchWriterConfig; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Instance; +import org.apache.accumulo.core.client.IsolatedScanner; +import org.apache.accumulo.core.client.MutationsRejectedException; +import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.TableNotFoundException; +import org.apache.accumulo.core.client.impl.Tables; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.KeyExtent; +import org.apache.accumulo.core.data.Mutation; +import org.apache.accumulo.core.data.Range; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.file.FileOperations; +import org.apache.accumulo.core.file.FileUtil; +import org.apache.accumulo.core.gc.thrift.GCMonitorService.Iface; +import org.apache.accumulo.core.gc.thrift.GCMonitorService.Processor; +import org.apache.accumulo.core.gc.thrift.GCStatus; +import org.apache.accumulo.core.gc.thrift.GcCycleStats; +import org.apache.accumulo.core.master.state.tables.TableState; +import org.apache.accumulo.core.security.CredentialHelper; +import org.apache.accumulo.core.security.SecurityUtil; +import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.util.AddressUtil; +import org.apache.accumulo.core.util.CachedConfiguration; +import org.apache.accumulo.core.util.NamingThreadFactory; +import org.apache.accumulo.core.util.ServerServices; +import org.apache.accumulo.core.util.ServerServices.Service; +import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.Z
[3/4] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d030cae Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d030cae Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d030cae Branch: refs/heads/master Commit: 5d030cae908905de0b4bc51981c7690011d390c7 Parents: a5a0552 72c9af4 Author: Keith Turner Authored: Thu Mar 27 12:39:59 2014 -0400 Committer: Keith Turner Committed: Thu Mar 27 12:39:59 2014 -0400 -- --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8485134d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8485134d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8485134d Branch: refs/heads/master Commit: 8485134d78092abddeffe99da17ba7182da98f65 Parents: be9cd71 5d030ca Author: Keith Turner Authored: Thu Mar 27 12:46:15 2014 -0400 Committer: Keith Turner Committed: Thu Mar 27 12:46:15 2014 -0400 -- --
[1/4] git commit: ACCUMULO-2520 change new log message about invalid delets from err to warn
Repository: accumulo
Updated Branches:
refs/heads/master be9cd71c2 -> 8485134d7
ACCUMULO-2520 change new log message about invalid delets from err to warn
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46191014
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46191014
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46191014
Branch: refs/heads/master
Commit: 461910148732e952131548ec7bbebb22dd79c8b8
Parents: 3bf2404
Author: Keith Turner
Authored: Thu Mar 27 12:31:06 2014 -0400
Committer: Keith Turner
Committed: Thu Mar 27 12:31:06 2014 -0400
--
.../java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/46191014/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
b/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
index d09c557..f9023b2 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
@@ -454,7 +454,7 @@ public class SimpleGarbageCollector implements Iface {
for (Iterator iterator = candidates.iterator();
iterator.hasNext();) {
String candidate = (String) iterator.next();
if (!isValidCandidate(candidate)) {
-log.error("Ingoring invalid deletion candidate " + candidate);
+log.warn("Ingoring invalid deletion candidate " + candidate);
iterator.remove();
}
}
[3/3] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d030cae Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d030cae Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d030cae Branch: refs/heads/1.6.0-SNAPSHOT Commit: 5d030cae908905de0b4bc51981c7690011d390c7 Parents: a5a0552 72c9af4 Author: Keith Turner Authored: Thu Mar 27 12:39:59 2014 -0400 Committer: Keith Turner Committed: Thu Mar 27 12:39:59 2014 -0400 -- --
[1/3] git commit: ACCUMULO-2520 change new log message about invalid delets from err to warn
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT a5a055233 -> 5d030cae9
ACCUMULO-2520 change new log message about invalid delets from err to warn
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46191014
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46191014
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46191014
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 461910148732e952131548ec7bbebb22dd79c8b8
Parents: 3bf2404
Author: Keith Turner
Authored: Thu Mar 27 12:31:06 2014 -0400
Committer: Keith Turner
Committed: Thu Mar 27 12:31:06 2014 -0400
--
.../java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/46191014/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
b/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
index d09c557..f9023b2 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
@@ -454,7 +454,7 @@ public class SimpleGarbageCollector implements Iface {
for (Iterator iterator = candidates.iterator();
iterator.hasNext();) {
String candidate = (String) iterator.next();
if (!isValidCandidate(candidate)) {
-log.error("Ingoring invalid deletion candidate " + candidate);
+log.warn("Ingoring invalid deletion candidate " + candidate);
iterator.remove();
}
}
[2/3] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' 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/72c9af4c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72c9af4c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72c9af4c Branch: refs/heads/1.6.0-SNAPSHOT Commit: 72c9af4c6b331edd87343be33a433a0b2cfcbc68 Parents: 1140d00 4619101 Author: Keith Turner Authored: Thu Mar 27 12:37:40 2014 -0400 Committer: Keith Turner Committed: Thu Mar 27 12:37:40 2014 -0400 -- .../java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/72c9af4c/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java -- diff --cc server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java index 0b7ff0f,000..9551fe3 mode 100644,00..100644 --- a/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java +++ b/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java @@@ -1,813 -1,0 +1,813 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.server.gc; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.regex.Pattern; + +import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.cli.Help; +import org.apache.accumulo.core.client.AccumuloException; +import org.apache.accumulo.core.client.AccumuloSecurityException; +import org.apache.accumulo.core.client.BatchWriter; +import org.apache.accumulo.core.client.BatchWriterConfig; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Instance; +import org.apache.accumulo.core.client.IsolatedScanner; +import org.apache.accumulo.core.client.MutationsRejectedException; +import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.TableNotFoundException; +import org.apache.accumulo.core.client.impl.Tables; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.KeyExtent; +import org.apache.accumulo.core.data.Mutation; +import org.apache.accumulo.core.data.Range; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.file.FileOperations; +import org.apache.accumulo.core.file.FileUtil; +import org.apache.accumulo.core.gc.thrift.GCMonitorService.Iface; +import org.apache.accumulo.core.gc.thrift.GCMonitorService.Processor; +import org.apache.accumulo.core.gc.thrift.GCStatus; +import org.apache.accumulo.core.gc.thrift.GcCycleStats; +import org.apache.accumulo.core.master.state.tables.TableState; +import org.apache.accumulo.core.security.CredentialHelper; +import org.apache.accumulo.core.security.SecurityUtil; +import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.util.AddressUtil; +import org.apache.accumulo.core.util.CachedConfiguration; +import org.apache.accumulo.core.util.NamingThreadFactory; +import org.apache.accumulo.core.util.ServerServices; +import org.apache.accumulo.core.util.ServerServices.Service; +import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zoo
[1/2] git commit: ACCUMULO-2520 change new log message about invalid delets from err to warn
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 1140d0077 -> 72c9af4c6
ACCUMULO-2520 change new log message about invalid delets from err to warn
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46191014
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46191014
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46191014
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 461910148732e952131548ec7bbebb22dd79c8b8
Parents: 3bf2404
Author: Keith Turner
Authored: Thu Mar 27 12:31:06 2014 -0400
Committer: Keith Turner
Committed: Thu Mar 27 12:31:06 2014 -0400
--
.../java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/46191014/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
b/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
index d09c557..f9023b2 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
@@ -454,7 +454,7 @@ public class SimpleGarbageCollector implements Iface {
for (Iterator iterator = candidates.iterator();
iterator.hasNext();) {
String candidate = (String) iterator.next();
if (!isValidCandidate(candidate)) {
-log.error("Ingoring invalid deletion candidate " + candidate);
+log.warn("Ingoring invalid deletion candidate " + candidate);
iterator.remove();
}
}
[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' 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/72c9af4c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72c9af4c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72c9af4c Branch: refs/heads/1.5.2-SNAPSHOT Commit: 72c9af4c6b331edd87343be33a433a0b2cfcbc68 Parents: 1140d00 4619101 Author: Keith Turner Authored: Thu Mar 27 12:37:40 2014 -0400 Committer: Keith Turner Committed: Thu Mar 27 12:37:40 2014 -0400 -- .../java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/72c9af4c/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java -- diff --cc server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java index 0b7ff0f,000..9551fe3 mode 100644,00..100644 --- a/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java +++ b/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java @@@ -1,813 -1,0 +1,813 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.server.gc; + +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.regex.Pattern; + +import org.apache.accumulo.core.Constants; +import org.apache.accumulo.core.cli.Help; +import org.apache.accumulo.core.client.AccumuloException; +import org.apache.accumulo.core.client.AccumuloSecurityException; +import org.apache.accumulo.core.client.BatchWriter; +import org.apache.accumulo.core.client.BatchWriterConfig; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Instance; +import org.apache.accumulo.core.client.IsolatedScanner; +import org.apache.accumulo.core.client.MutationsRejectedException; +import org.apache.accumulo.core.client.Scanner; +import org.apache.accumulo.core.client.TableNotFoundException; +import org.apache.accumulo.core.client.impl.Tables; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.KeyExtent; +import org.apache.accumulo.core.data.Mutation; +import org.apache.accumulo.core.data.Range; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.file.FileOperations; +import org.apache.accumulo.core.file.FileUtil; +import org.apache.accumulo.core.gc.thrift.GCMonitorService.Iface; +import org.apache.accumulo.core.gc.thrift.GCMonitorService.Processor; +import org.apache.accumulo.core.gc.thrift.GCStatus; +import org.apache.accumulo.core.gc.thrift.GcCycleStats; +import org.apache.accumulo.core.master.state.tables.TableState; +import org.apache.accumulo.core.security.CredentialHelper; +import org.apache.accumulo.core.security.SecurityUtil; +import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.util.AddressUtil; +import org.apache.accumulo.core.util.CachedConfiguration; +import org.apache.accumulo.core.util.NamingThreadFactory; +import org.apache.accumulo.core.util.ServerServices; +import org.apache.accumulo.core.util.ServerServices.Service; +import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zoo
git commit: ACCUMULO-2520 change new log message about invalid delets from err to warn
Repository: accumulo
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 3bf240429 -> 461910148
ACCUMULO-2520 change new log message about invalid delets from err to warn
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46191014
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46191014
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46191014
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 461910148732e952131548ec7bbebb22dd79c8b8
Parents: 3bf2404
Author: Keith Turner
Authored: Thu Mar 27 12:31:06 2014 -0400
Committer: Keith Turner
Committed: Thu Mar 27 12:31:06 2014 -0400
--
.../java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/46191014/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
b/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
index d09c557..f9023b2 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
@@ -454,7 +454,7 @@ public class SimpleGarbageCollector implements Iface {
for (Iterator iterator = candidates.iterator();
iterator.hasNext();) {
String candidate = (String) iterator.next();
if (!isValidCandidate(candidate)) {
-log.error("Ingoring invalid deletion candidate " + candidate);
+log.warn("Ingoring invalid deletion candidate " + candidate);
iterator.remove();
}
}
