[01/37] git commit: ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 1fe5f7f52 - 6446ad5c2
ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1398373
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit ca1494d1508a3b1404ae9989d4211b00aa3ce307)
Reason: Hadoop2 compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc3fdf33
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fc3fdf33
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fc3fdf33
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: fc3fdf33716aa7105e1792c81dfb452fbf8c7944
Parents: aff0d64
Author: Billie Rinaldi bil...@apache.org
Authored: Mon Oct 15 16:32:24 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:41 2013 -0500
--
.../java/org/apache/accumulo/core/util/TTimeoutTransport.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fc3fdf33/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
index 6f74451..3c1fa6a 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
@@ -25,8 +25,7 @@ import java.net.Socket;
import java.net.SocketAddress;
import java.nio.channels.spi.SelectorProvider;
-import org.apache.hadoop.net.SocketInputStream;
-import org.apache.hadoop.net.SocketOutputStream;
+import org.apache.hadoop.net.NetUtils;
import org.apache.thrift.transport.TIOStreamTransport;
import org.apache.thrift.transport.TTransport;
@@ -37,8 +36,8 @@ public class TTimeoutTransport {
socket.setSoLinger(false, 0);
socket.setTcpNoDelay(true);
socket.connect(addr);
-InputStream input = new BufferedInputStream(new SocketInputStream(socket,
timeoutMillis), 1024 * 10);
-OutputStream output = new BufferedOutputStream(new
SocketOutputStream(socket, timeoutMillis), 1024 * 10);
+InputStream input = new
BufferedInputStream(NetUtils.getInputStream(socket, timeoutMillis), 1024 * 10);
+OutputStream output = new
BufferedOutputStream(NetUtils.getOutputStream(socket, timeoutMillis), 1024 *
10);
return new TIOStreamTransport(input, output);
}
}
[05/37] ACCUMULO-600 removed wikisearch from trunk
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8db62992/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml -- diff --git a/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml b/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml deleted file mode 100644 index 41d146a..000 --- a/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml +++ /dev/null @@ -1,153 +0,0 @@ -mediawiki xmlns=http://www.mediawiki.org/xml/export-0.5/; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://www.mediawiki.org/xml/export-0.5/ http://www.mediawiki.org/xml/export-0.5.xsd; version=0.5 xml:lang=en - siteinfo -sitenameWikipedia/sitename -basehttp://en.wikipedia.org/wiki/Main_Page/base -generatorMediaWiki 1.17wmf1/generator -casefirst-letter/case -namespaces - namespace key=-2 case=first-letterMedia/namespace - namespace key=-1 case=first-letterSpecial/namespace - namespace key=0 case=first-letter / - namespace key=1 case=first-letterTalk/namespace - namespace key=2 case=first-letterUser/namespace - namespace key=3 case=first-letterUser talk/namespace - namespace key=4 case=first-letterWikipedia/namespace - namespace key=5 case=first-letterWikipedia talk/namespace - namespace key=6 case=first-letterFile/namespace - namespace key=7 case=first-letterFile talk/namespace - namespace key=8 case=first-letterMediaWiki/namespace - namespace key=9 case=first-letterMediaWiki talk/namespace - namespace key=10 case=first-letterTemplate/namespace - namespace key=11 case=first-letterTemplate talk/namespace - namespace key=12 case=first-letterHelp/namespace - namespace key=13 case=first-letterHelp talk/namespace - namespace key=14 case=first-letterCategory/namespace - namespace key=15 case=first-letterCategory talk/namespace - namespace key=100 case=first-letterPortal/namespace - namespace key=101 case=first-letterPortal talk/namespace - namespace key=108 case=first-letterBook/namespace - namespace key=109 case=first-letterBook talk/namespace -/namespaces - /siteinfo - page -titleAbacus/title -id655/id -revision - id34350/id - timestamp2002-02-25T15:43:11Z/timestamp - contributor -ipConversion script/ip - /contributor - minor / - commentAutomated conversion/comment - text xml:space=preserve1. An '''abacus''' is a counting frame, typically wooden with balls sliding on wires. It was first used before the adoption of the ten-digit [[Arabic numerals | Arabic numeral]] system and is still widely used by small merchants in [[China]]. The Roman abacus contains seven long and seven shorter rods or bars, the former having four perforated beads running on them and the latter one. The bar marked 1 indicates units, X tens, and so on up to millions. The beads on the shorter bars denote fives,--five units, five tens, etc. The rod O and corresponding short rod are for marking ounces; and the short quarter rods for fractions of an ounce. Computations are made with it by means of balls of bone or ivory running on slender bamboo rods, similar to the simpler board, fitted up with beads strung on wires, which has been employed in teaching the rudiments of arithmetic in English schools. - -The '''Suan'''4-'''Pan'''2 (amp;#31639;amp;#30436;) of the Chinese closely resembles the Roman abacus in its construction and use. The Chinese abacus is usally around eight inches tall and it comes in various width depending on application, it usually has more than seven rods. There are two beads on each rod in the upper deck and five beads each in the bottom. The beads are usually round and made of hard wood. The abacus can be reset to the starting position instantly by a quick jerk along the horizontal axis to spin all the beads away from the horizontal beam at the center. The beads are counted by moving them up or down towards the beam. Chinese abacus does more than just counting. Unlike the simple counting board used in elimentary schools, very efficient Suan4-Pan2 techniques were developed to do multiplication, division, addition, substraction, square root and cubic root at high speed. The beads and rods were often lubricated to ensure speed. When all five beads in the lower deck are moved up, they are reset to the original position, and one bead in the top deck is moved down as a carry. When both beads in the upper deck are moved down, they are reset and a bead on the adjacent rod on the left is moved up as a carry. The result of the computation is read off from the beads clustered near the separator beam between the upper and lower deck. In a sense, the abacus works as a 5-2-5-2-5-2... based number system in which carries and shiftings are similiar to
[12/37] ACCUMULO-600 removed wikisearch from trunk
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8db62992/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
--
diff --git
a/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
b/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
deleted file mode 100644
index 87b4da2..000
---
a/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * 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.examples.wikisearch.iterator;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.accumulo.core.data.ByteSequence;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.PartialKey;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.examples.wikisearch.parser.EventFields;
-import org.apache.accumulo.examples.wikisearch.parser.QueryEvaluator;
-import org.apache.commons.jexl2.parser.ParseException;
-import org.apache.log4j.Logger;
-
-
-import com.esotericsoftware.kryo.Kryo;
-
-/**
- *
- * This iterator aggregates rows together using the specified key comparator.
Subclasses will provide their own implementation of fillMap which will fill the
- * supplied EventFields object with field names (key) and field values
(value). After all fields have been put into the aggregated object (by
aggregating all
- * columns with the same key), the EventFields object will be compared against
the supplied expression. If the expression returns true, then the return key and
- * return value can be retrieved via getTopKey() and getTopValue().
- *
- * Optionally, the caller can set an expression (field operator value) that
should not be evaluated against the event. For example, if the query is
- * A == 'foo' and B == 'bar', but for some reason B may not be in the data,
then setting the UNEVALUATED_EXPRESSIONS option to B == 'bar' will allow the
- * events to be evaluated against the remainder of the expression and still
return as true.
- *
- * By default this iterator will return all Events in the shard. If the
START_DATE and END_DATE are specified, then this iterator will evaluate the
timestamp of
- * the key against the start and end dates. If the event date is not within
the range of start to end, then it is skipped.
- *
- * This iterator will return up the stack an EventFields object serialized
using Kryo in the cell Value.
- *
- */
-public abstract class AbstractEvaluatingIterator implements
SortedKeyValueIteratorKey,Value, OptionDescriber {
-
- private static Logger log =
Logger.getLogger(AbstractEvaluatingIterator.class);
- protected static final byte[] NULL_BYTE = new byte[0];
- public static final String QUERY_OPTION = expr;
- public static final String UNEVALUTED_EXPRESSIONS =
unevaluated.expressions;
-
- private PartialKey comparator = null;
- protected SortedKeyValueIteratorKey,Value iterator;
- private Key currentKey = new Key();
- private Key returnKey;
- private Value returnValue;
- private String expression;
- private QueryEvaluator evaluator;
- private EventFields event = null;
- private static Kryo kryo = new Kryo();
- private Range seekRange = null;
- private SetString skipExpressions = null;
-
- protected AbstractEvaluatingIterator(AbstractEvaluatingIterator other,
IteratorEnvironment env) {
-iterator = other.iterator.deepCopy(env);
-event = other.event;
- }
-
- public AbstractEvaluatingIterator() {}
-
- /**
- * Implementations will return
[30/37] git commit: ACCUMULO-1876 default for slf4j.version
ACCUMULO-1876 default for slf4j.version Sets default to 1.4.3 as hadoop-1.0 is default in parent pom for 1.5.1-SNAPSHOT (cherry picked from commit c93872afd3e191ea81e353e609749128d3b5c417) Reason: bugfix Author: Michael Wall mjw...@gmail.com Ref: ACCUMULO-1792 Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c0939746 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c0939746 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c0939746 Branch: refs/heads/1.4.5-SNAPSHOT Commit: c093974647a93f70320c5d62eeff00e27fa3149d Parents: 5e3967f Author: Michael Wall mjw...@gmail.com Authored: Fri Nov 15 16:29:46 2013 -0600 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c0939746/pom.xml -- diff --git a/pom.xml b/pom.xml index ca550d5..eda8390 100644 --- a/pom.xml +++ b/pom.xml @@ -868,6 +868,8 @@ properties targetJdk1.6/targetJdk +!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -- +slf4j.version1.4.3/slf4j.version zookeeper.version3.3.1/zookeeper.version /properties
[27/37] git commit: ACCUMULO-1792 Cleanup test* system tests.
ACCUMULO-1792 Cleanup test* system tests. This patch most resembles work done in ACCUMULO-745. 745 is a massive patch applied to Accumulo 1.5 that changed all the command line handling of all of the programs that had main method. When this update was done, several of the concerned addressed in this patch were handled. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/651033a5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/651033a5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/651033a5 Branch: refs/heads/1.4.5-SNAPSHOT Commit: 651033a522f9b1ac51508e60c3cdcd6da02643d8 Parents: 8db6299 Author: Jonathan Hsieh j...@cloudera.com Authored: Sun Jul 7 13:06:27 2013 -0700 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:43 2013 -0500 -- test/system/test1/README | 2 +- test/system/test2/concurrent.sh | 90 +++--- test/system/test3/bigrow.sh | 12 ++-- test/system/test4/bulk_import_test.sh | 32 +-- test/system/test5/insert_test.sh | 18 -- 5 files changed, 68 insertions(+), 86 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/651033a5/test/system/test1/README -- diff --git a/test/system/test1/README b/test/system/test1/README index 4c995fb..8003b3d 100644 --- a/test/system/test1/README +++ b/test/system/test1/README @@ -3,7 +3,7 @@ Command to run from command line #Can run this test with pre-existing splits... use the following command to create the table with #100 pre-existing splits -#../../../bin/accumulo 'org.apache.accumulo.server.test.TestIngest$CreateTable' 0 500 100 +#../../../bin/accumulo 'org.apache.accumulo.server.test.TestIngest$CreateTable' 0 500 100 user pw #could try running verify commands after stopping and restarting accumulo http://git-wip-us.apache.org/repos/asf/accumulo/blob/651033a5/test/system/test2/concurrent.sh -- diff --git a/test/system/test2/concurrent.sh b/test/system/test2/concurrent.sh index 69790a0..1ce9299 100755 --- a/test/system/test2/concurrent.sh +++ b/test/system/test2/concurrent.sh @@ -17,80 +17,80 @@ echo ingesting first halves (0 to (500K - 1), 1M to (1.5M - 1), etc) -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 0 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 100 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 200 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 300 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 400 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 0 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 100 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 200 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 300 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 400 1 wait echo ingesting second halves (500K to (1M - 1), 1.5M to (2M - 1), etc) and verifying first halves -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 0 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 100 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 200 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 300 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 400 1 +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 0 1 +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50
[28/37] git commit: ACCUMULO-645 found another HADOOP_HOME reference
ACCUMULO-645 found another HADOOP_HOME reference git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1433102 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 16c9a002e2d2c1556d8f836217042ebcf008da5a) Reason: Hadoop2 Compat Author: Eric C. Newton e...@apache.org Ref: ACCUMULO-1792 Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3a350960 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3a350960 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3a350960 Branch: refs/heads/1.4.5-SNAPSHOT Commit: 3a3509604a71a549c4b1f07d1411b3e25bf3f7bf Parents: 5dd9016 Author: Eric C. Newton e...@apache.org Authored: Mon Jan 14 20:26:20 2013 + Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- conf/examples/1GB/native-standalone/accumulo-site.xml | 6 +++--- conf/examples/1GB/standalone/accumulo-site.xml | 6 +++--- conf/examples/2GB/native-standalone/accumulo-site.xml | 6 +++--- conf/examples/2GB/standalone/accumulo-site.xml | 6 +++--- conf/examples/3GB/native-standalone/accumulo-site.xml | 6 +++--- conf/examples/3GB/standalone/accumulo-site.xml | 6 +++--- conf/examples/512MB/native-standalone/accumulo-site.xml | 6 +++--- conf/examples/512MB/standalone/accumulo-site.xml| 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/1GB/native-standalone/accumulo-site.xml -- diff --git a/conf/examples/1GB/native-standalone/accumulo-site.xml b/conf/examples/1GB/native-standalone/accumulo-site.xml index 3f4705d..97f70d5 100644 --- a/conf/examples/1GB/native-standalone/accumulo-site.xml +++ b/conf/examples/1GB/native-standalone/accumulo-site.xml @@ -102,9 +102,9 @@ $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, $ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar, - $HADOOP_HOME/conf, - $HADOOP_HOME/[^.].*.jar, - $HADOOP_HOME/lib/[^.].*.jar, + $HADOOP_CONF_DIR, + $HADOOP_PREFIX/[^.].*.jar, + $HADOOP_PREFIX/lib/[^.].*.jar, /value descriptionClasspaths that accumulo checks for updates and class files. When using the Security Manager, please remove the .../target/classes/ values. http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/1GB/standalone/accumulo-site.xml -- diff --git a/conf/examples/1GB/standalone/accumulo-site.xml b/conf/examples/1GB/standalone/accumulo-site.xml index 5c45e21..f857fd0 100644 --- a/conf/examples/1GB/standalone/accumulo-site.xml +++ b/conf/examples/1GB/standalone/accumulo-site.xml @@ -97,9 +97,9 @@ $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, $ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar, - $HADOOP_HOME/conf, - $HADOOP_HOME/[^.].*.jar, - $HADOOP_HOME/lib/[^.].*.jar, + $HADOOP_CONF_DIR, + $HADOOP_PREFIX/[^.].*.jar, + $HADOOP_PREFIX/lib/[^.].*.jar, /value descriptionClasspaths that accumulo checks for updates and class files. When using the Security Manager, please remove the .../target/classes/ values. http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/2GB/native-standalone/accumulo-site.xml -- diff --git a/conf/examples/2GB/native-standalone/accumulo-site.xml b/conf/examples/2GB/native-standalone/accumulo-site.xml index f39b367..3988e66 100644 --- a/conf/examples/2GB/native-standalone/accumulo-site.xml +++ b/conf/examples/2GB/native-standalone/accumulo-site.xml @@ -92,9 +92,9 @@ $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, $ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar, - $HADOOP_HOME/conf, - $HADOOP_HOME/[^.].*.jar, - $HADOOP_HOME/lib/[^.].*.jar, + $HADOOP_CONF_DIR, + $HADOOP_PREFIX/[^.].*.jar, + $HADOOP_PREFIX/lib/[^.].*.jar, /value descriptionClasspaths that accumulo checks for updates and class files. When using the Security Manager, please remove the .../target/classes/ values. http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/2GB/standalone/accumulo-site.xml -- diff --git a/conf/examples/2GB/standalone/accumulo-site.xml b/conf/examples/2GB/standalone/accumulo-site.xml index 653860b..9f5d7fd 100644 --- a/conf/examples/2GB/standalone/accumulo-site.xml +++
[02/37] git commit: ACCUMULO-1520 misc functional test fixes
ACCUMULO-1520 misc functional test fixes
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1494361
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 9ac99ea8b402792b36c494c02ac3103e7a061e2a)
Reason: Test
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Hadoop2 by default emits extra logging information to stdout which causes
accumulo's ListTables to emit
extra data to stdout. This filters out these invalid lines ListTables.
Author: Jon Hsieh jmhs...@apache.org
Included the presplit multiplier portion because the LongRowTest has been
failing for me regularly on VMs on 1.4.5-SNAPSHOT and this change makes 1.4.x
consistent with the other active development branches.
Included the search example change for consistency since the rest of hte patch
was applicable.
Author: Sean Busbey bus...@clouderagovt.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aff0d641
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aff0d641
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aff0d641
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: aff0d641274d78a5682defbd5e6d0717aac68546
Parents: 1fe5f7f
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Mon Jun 24 00:36:19 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:41 2013 -0500
--
.../apache/accumulo/server/test/functional/LargeRowTest.java | 2 +-
test/system/auto/TestUtils.py | 5 +
test/system/auto/simple/examples.py| 6 +++---
3 files changed, 9 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
b/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
index bc02929..df98f6e 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
@@ -95,7 +95,7 @@ public class LargeRowTest extends FunctionalTest {
UtilWaitThread.sleep(1);
-checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS);
+checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS * 4);
verify(REG_TABLE_NAME);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index b70677a..b7659a2 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -458,6 +458,11 @@ class TestUtilsMixin:
out,err = handle.communicate()
self.assert_(handle.returncode==0)
for line in out.split('\n') :
+
+# filter out unwanted extra hadoop2 logging
+if line.find(=) 0:
+ continue
+
left, right = line.split(=)
left = left.strip()
right = right.strip()
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/test/system/auto/simple/examples.py
--
diff --git a/test/system/auto/simple/examples.py
b/test/system/auto/simple/examples.py
index b22411a..bed321f 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -80,14 +80,14 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'dataTable',
visibility,
10,
- ACCUMULO_HOME+/src)
+ ACCUMULO_HOME+/test)
self.comment( searching for a file)
handle = self.runOn('localhost', [self.accumulo_sh(),
'org.apache.accumulo.examples.simple.dirlist.QueryUtil',
INSTANCE_NAME, ZOOKEEPERS, ROOT,
ROOT_PASSWORD,
- 'indexTable', auths, 'Fate.java',
'-search'])
+ 'indexTable', auths, 'examples.py',
'-search'])
out, err = handle.communicate()
self.assert_(handle.returncode == 0)
-self.assert_(out.find('accumulo/server/fate/Fate.java') = 0)
+self.assert_(out.find('test/system/auto/simple/examples.py') = 0)
self.comment( found file at + out)
[36/37] git commit: ACCUMULO-645: found more references to HADOOP_HOME
ACCUMULO-645: found more references to HADOOP_HOME git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1431596 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 02829fffc3ad9261648da5dd12a02dfcafa5a0fa) Reason: Hadoop2 compat Author: Eric C. Newton e...@apache.org Ref: ACCUMULO-1792 Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d70e5a12 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d70e5a12 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d70e5a12 Branch: refs/heads/1.4.5-SNAPSHOT Commit: d70e5a12739a7775995340be3dca5d460cdf7be2 Parents: 344e725 Author: Eric C. Newton e...@apache.org Authored: Thu Jan 10 20:10:42 2013 + Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- bin/tool.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d70e5a12/bin/tool.sh -- diff --git a/bin/tool.sh b/bin/tool.sh index 3c114e8..cefd6b9 100755 --- a/bin/tool.sh +++ b/bin/tool.sh @@ -20,8 +20,8 @@ bin=`dirname $0` bin=`cd $bin; pwd` . $bin/config.sh -if [ -z $HADOOP_HOME ] ; then -echo HADOOP_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh +if [ -z $HADOOP_PREFIX ] ; then +echo HADOOP_PREFIX is not set. Please make sure it's set globally or in conf/accumulo-env.sh exit 1 fi if [ -z $ZOOKEEPER_HOME ] ; then @@ -98,5 +98,5 @@ fi #echo USERJARS=$USERJARS #echo CLASSNAME=$CLASSNAME #echo HADOOP_CLASSPATH=$HADOOP_CLASSPATH -#echo exec $HADOOP_HOME/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $ARGS -exec $HADOOP_HOME/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $@ +#echo exec $HADOOP_PREFIX/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $ARGS +exec $HADOOP_PREFIX/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $@
[26/37] git commit: ACCUMULO-769 Fix Hadoop 2.0 breakage by removing methods marked as deprecated that didn't exist in prior version. ACCUMULO-975 Fix proxy pom.xml to support Hadoop 2.0
ACCUMULO-769 Fix Hadoop 2.0 breakage by removing methods marked as deprecated
that didn't exist in prior version. ACCUMULO-975 Fix proxy pom.xml to support
Hadoop 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1435230
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit ec4055c698d7735093e964e30729ede9df71157f)
Reason: Hadoop2 compat
Author: Christopher Tubbs ctubb...@apache.org
Ref: ACCUMULO-1792
This patch differs from upstream by only including the changes relevant to
ACCUMULO-975. It also does not reformat as much of proxy/pom.xml as the
original.
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c16d8b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c16d8b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4c16d8b8
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 4c16d8b82713cb888e33a224a57d0d41b156b50b
Parents: 0f97284
Author: Sean Busbey bus...@cloudera.com
Authored: Mon Nov 4 15:39:14 2013 -0600
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
src/proxy/pom.xml | 96 ++
1 file changed, 65 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4c16d8b8/src/proxy/pom.xml
--
diff --git a/src/proxy/pom.xml b/src/proxy/pom.xml
index 5d0414d..e1daa29 100644
--- a/src/proxy/pom.xml
+++ b/src/proxy/pom.xml
@@ -33,22 +33,22 @@
build
pluginManagement
plugins
- plugin
- groupIdorg.apache.maven.plugins/groupId
- artifactIdmaven-jar-plugin/artifactId
- configuration
- archive
- manifestSections
- manifestSection
- nameaccumulo/proxy//name
- manifestEntries
- Sealedtrue/Sealed
- /manifestEntries
- /manifestSection
- /manifestSections
- /archive
- /configuration
- /plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-jar-plugin/artifactId
+ configuration
+archive
+ manifestSections
+manifestSection
+ nameaccumulo/proxy//name
+ manifestEntries
+Sealedtrue/Sealed
+ /manifestEntries
+/manifestSection
+ /manifestSections
+/archive
+ /configuration
+/plugin
/plugins
/pluginManagement
plugins
@@ -72,9 +72,9 @@
/build
dependencies
dependency
-groupIdorg.apache.accumulo/groupId
-artifactIdaccumulo-core/artifactId
-scopecompile/scope
+ groupIdorg.apache.accumulo/groupId
+ artifactIdaccumulo-core/artifactId
+ scopecompile/scope
/dependency
dependency
groupIdorg.apache.accumulo/groupId
@@ -82,11 +82,6 @@
scopecompile/scope
/dependency
dependency
-groupIdorg.apache.hadoop/groupId
-artifactIdhadoop-core/artifactId
-scopecompile/scope
-/dependency
-dependency
groupIdorg.apache.zookeeper/groupId
artifactIdzookeeper/artifactId
scopecompile/scope
@@ -113,16 +108,55 @@
scopecompile/scope
/dependency
dependency
- groupIdorg.apache.accumulo/groupId
- artifactIdexamples-simple/artifactId
- version${project.version}/version
- scopetest/scope
+ groupIdorg.apache.accumulo/groupId
+ artifactIdexamples-simple/artifactId
+ version${project.version}/version
+ scopetest/scope
/dependency
dependency
-groupIdorg.apache.accumulo/groupId
-artifactIdaccumulo-server/artifactId
-version${project.version}/version
+ groupIdorg.apache.accumulo/groupId
+ artifactIdaccumulo-server/artifactId
+ version${project.version}/version
/dependency
/dependencies
+ profiles
+!-- profile for building against Hadoop 1.0.x
+Activate by not specifying hadoop.profile --
+profile
+ idhadoop-1.0/id
+ activation
+property
+ name!hadoop.profile/name
+/property
+ /activation
+ dependencies
+dependency
+ groupIdorg.apache.hadoop/groupId
+ artifactIdhadoop-core/artifactId
+/dependency
+ /dependencies
+/profile
+!-- profile for building against Hadoop 2.0.x
+Activate using: mvn -Dhadoop.profile=2.0 --
+
[31/37] git commit: ACCUMULO-804 fix the functional tests for hadoop-2.0
ACCUMULO-804 fix the functional tests for hadoop-2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1458388
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 17ef9c25ef2970b02b4771217f4bdf06fa0517a8)
Reason: Hadoop2 Compat
Author: Eric C. Newton
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d5f16575
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d5f16575
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d5f16575
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: d5f16575f721d4fa7977dd1d1e8a9d9e7481b1ab
Parents: 4f7fb04
Author: Sean Busbey bus...@cloudera.com
Authored: Thu Oct 10 13:19:16 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
test/system/auto/TestUtils.py | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d5f16575/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index 0e1bf1a..f6eca67 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -67,6 +67,10 @@ $ACCUMULO_HOME/server/target/classes/,
$HADOOP_CONF_DIR,
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
log = logging.getLogger('test.auto')
[37/37] git commit: ACCUMULO-645 switch to using HADOOP_PREFIX and HADOOP_CONF_DIR
ACCUMULO-645 switch to using HADOOP_PREFIX and HADOOP_CONF_DIR
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1431051
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit b8fdefd91927f82809dfdc4004569f2e223ebdeb)
Reason: Hadoop2 compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/344e7254
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/344e7254
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/344e7254
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 344e725426e76b952d0f390d65ef6062c35fdc03
Parents: 651033a
Author: Eric C. Newton e...@apache.org
Authored: Wed Jan 9 20:43:35 2013 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
bin/config.sh | 16
conf/examples/1GB/native-standalone/accumulo-env.sh | 10 +-
conf/examples/1GB/standalone/accumulo-env.sh| 10 +-
conf/examples/2GB/native-standalone/accumulo-env.sh | 9 -
conf/examples/2GB/standalone/accumulo-env.sh| 10 +-
conf/examples/3GB/native-standalone/accumulo-env.sh | 9 -
conf/examples/3GB/standalone/accumulo-env.sh| 9 -
.../512MB/native-standalone/accumulo-env.sh | 9 -
conf/examples/512MB/standalone/accumulo-env.sh | 9 -
9 files changed, 75 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/344e7254/bin/config.sh
--
diff --git a/bin/config.sh b/bin/config.sh
index 5836b46..d9300d5 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -72,23 +72,23 @@ if [ -z ${ACCUMULO_VERSION} ]; then
ACCUMULO_VERSION=1.4.5-SNAPSHOT
fi
-if [ -z $HADOOP_HOME ]
+if [ -z $HADOOP_PREFIX ]
then
HADOOP_HOME=`which hadoop`
- if [ -z $HADOOP_HOME ]
+ if [ -z $HADOOP_PREFIX ]
then
- echo You must set HADOOP_HOME
+ echo You must set HADOOP_PREFIX
exit 1
fi
- HADOOP_HOME=`dirname $HADOOP_HOME`
- HADOOP_HOME=`dirname $HADOOP_HOME`
+ HADOOP_HOME=`dirname $HADOOP_PREFIX`
+ HADOOP_HOME=`dirname $HADOOP_PREFIX`
fi
-if [ ! -d $HADOOP_HOME ]
+if [ ! -d $HADOOP_PREFIX ]
then
-echo $HADOOP_HOME is not a directory
+echo $HADOOP_PREFIX is not a directory
exit 1
fi
-export HADOOP_HOME
+export HADOOP_PREFIX
if [ ! -f $ACCUMULO_CONF_DIR/masters -o ! -f $ACCUMULO_CONF_DIR/slaves ]
then
http://git-wip-us.apache.org/repos/asf/accumulo/blob/344e7254/conf/examples/1GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh
b/conf/examples/1GB/native-standalone/accumulo-env.sh
index 4033152..15caef6 100755
--- a/conf/examples/1GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/1GB/native-standalone/accumulo-env.sh
@@ -27,9 +27,17 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z $HADOOP_HOME ]
+then
+ test -z $HADOOP_PREFIX export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX=$HADOOP_HOME
+ unset HADOOP_HOME
+fi
+test -z $HADOOP_CONF_DIRexport
HADOOP_CONF_DIR=$HADOOP_PREFIX/conf
+
test -z $JAVA_HOME export JAVA_HOME=/path/to/java
-test -z $HADOOP_HOMEexport HADOOP_HOME=/path/to/hadoop
test -z $ZOOKEEPER_HOME export ZOOKEEPER_HOME=/path/to/zookeeper
test -z $ACCUMULO_LOG_DIR export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
if [ -f ${ACCUMULO_CONF_DIR}/accumulo.policy ]
http://git-wip-us.apache.org/repos/asf/accumulo/blob/344e7254/conf/examples/1GB/standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/standalone/accumulo-env.sh
b/conf/examples/1GB/standalone/accumulo-env.sh
index 4d09467..5c54a39 100755
--- a/conf/examples/1GB/standalone/accumulo-env.sh
+++ b/conf/examples/1GB/standalone/accumulo-env.sh
@@ -27,9 +27,17 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z $HADOOP_HOME ]
+then
+ test -z $HADOOP_PREFIX export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX=$HADOOP_HOME
+ unset HADOOP_HOME
+fi
+test -z $HADOOP_CONF_DIRexport
HADOOP_CONF_DIR=$HADOOP_PREFIX/conf
+
test -z $JAVA_HOME export JAVA_HOME=/path/to/java
-test -z $HADOOP_HOMEexport HADOOP_HOME=/path/to/hadoop
test -z $ZOOKEEPER_HOME export ZOOKEEPER_HOME=/path/to/zookeeper
test -z $ACCUMULO_LOG_DIR export
[29/37] git commit: ACCUMULO-804 pick up the new location of the hadoop jars
ACCUMULO-804 pick up the new location of the hadoop jars
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1456640
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 21780bd2950df7e72a8b1bd3ddef5017b07b63ad)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Skips changes to MiniAccumuloCluster that were already present in backport.
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f7fb04b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f7fb04b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4f7fb04b
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 4f7fb04b0b485377daa7d0bd0985994d1ce86173
Parents: 3a35096
Author: Sean Busbey bus...@cloudera.com
Authored: Sun Oct 27 23:24:49 2013 -0400
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
bin/accumulo | 17 +++--
.../1GB/native-standalone/accumulo-env.sh | 2 ++
.../1GB/native-standalone/accumulo-site.xml | 7 +++
conf/examples/1GB/standalone/accumulo-env.sh | 2 ++
conf/examples/1GB/standalone/accumulo-site.xml| 7 +++
.../2GB/native-standalone/accumulo-env.sh | 2 ++
.../2GB/native-standalone/accumulo-site.xml | 7 +++
conf/examples/2GB/standalone/accumulo-env.sh | 2 ++
.../3GB/native-standalone/accumulo-env.sh | 2 ++
.../3GB/native-standalone/accumulo-site.xml | 7 +++
conf/examples/3GB/standalone/accumulo-env.sh | 2 ++
conf/examples/3GB/standalone/accumulo-site.xml| 7 +++
.../512MB/native-standalone/accumulo-env.sh | 2 ++
.../512MB/native-standalone/accumulo-site.xml | 7 +++
conf/examples/512MB/standalone/accumulo-env.sh| 2 ++
conf/examples/512MB/standalone/accumulo-site.xml | 7 +++
.../start/classloader/AccumuloClassLoader.java| 18 --
17 files changed, 92 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/bin/accumulo
--
diff --git a/bin/accumulo b/bin/accumulo
index bbca3f0..e2a89e9 100755
--- a/bin/accumulo
+++ b/bin/accumulo
@@ -131,6 +131,19 @@ CLASSPATH=${XML_FILES}:${START_JAR}:${COMMONS_JCI_JARS}
JAVA=$JAVA_HOME/bin/java
PLATFORM=`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`
-
+# hadoop 1.0, 1.1
+LIB_PATH=$HADOOP_PREFIX/lib/native/$PLATFORM
+if [ ! -d $LIB_PATH ]; then
+ # hadoop-2.0
+ LIB_PATH=$HADOOP_PREFIX/lib/native
+fi
+#
# app isn't used anywhere, but it makes the process easier to spot when
ps/top/snmp truncate the command line
-exec $JAVA -Dapp=$1 -classpath $CLASSPATH $ACCUMULO_OPTS
-XX:OnOutOfMemoryError=${ACCUMULO_KILL_CMD:-kill -9 %p}
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
-Djava.library.path=$HADOOP_PREFIX/lib/native/$PLATFORM
-Dorg.apache.accumulo.core.home.dir=$ACCUMULO_HOME
-Dhadoop.home.dir=$HADOOP_PREFIX -Dhadoop.conf.dir=$HADOOP_CONF_DIR
-Dzookeeper.home.dir=$ZOOKEEPER_HOME org.apache.accumulo.start.Main $@
+exec $JAVA -Dapp=$1 $ACCUMULO_OPTS -classpath $CLASSPATH
-XX:OnOutOfMemoryError=${ACCUMULO_KILL_CMD:-kill -9 %p} \
+
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
\
+ -Djava.library.path=$LIB_PATH \
+ -Dorg.apache.accumulo.core.home.dir=$ACCUMULO_HOME \
+ -Dhadoop.home.dir=$HADOOP_PREFIX \
+ -Dzookeeper.home.dir=$ZOOKEEPER_HOME \
+ org.apache.accumulo.start.Main \
+ $@
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/1GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh
b/conf/examples/1GB/native-standalone/accumulo-env.sh
index 15caef6..e301eb8 100755
--- a/conf/examples/1GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/1GB/native-standalone/accumulo-env.sh
@@ -35,6 +35,8 @@ else
unset HADOOP_HOME
fi
test -z $HADOOP_CONF_DIRexport
HADOOP_CONF_DIR=$HADOOP_PREFIX/conf
+# hadoop-2.0:
+# test -z $HADOOP_CONF_DIR export
HADOOP_CONF_DIR=$HADOOP_PREFIX/etc/hadoop
test -z $JAVA_HOME export JAVA_HOME=/path/to/java
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/1GB/native-standalone/accumulo-site.xml
--
diff --git a/conf/examples/1GB/native-standalone/accumulo-site.xml
b/conf/examples/1GB/native-standalone/accumulo-site.xml
index 97f70d5..e995bfe 100644
---
[14/37] ACCUMULO-600 removed wikisearch from trunk
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8db62992/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
--
diff --git
a/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
b/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
deleted file mode 100644
index c842da7..000
---
a/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * 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.examples.wikisearch.reader;
-
-import static org.junit.Assert.assertEquals;
-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.FileWriter;
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.accumulo.core.util.ContextFactory;
-import
org.apache.accumulo.examples.wikisearch.ingest.WikipediaInputFormat.WikipediaInputSplit;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.lib.input.FileSplit;
-import org.junit.Before;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public class AggregatingRecordReaderTest {
-
- public static class MyErrorHandler implements ErrorHandler {
-
-@Override
-public void error(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
-@Override
-public void fatalError(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
-@Override
-public void warning(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
- }
-
- private static final String xml1 = ?xml version=\1.0\
encoding=\UTF-8\? + doc\n + aA/a\n + bB/b\n + /doc\n
- + ?xml version=\1.0\ encoding=\UTF-8\? + doc\n +
aC/a\n + bD/b\n + /doc\n + ?xml version=\1.0\
encoding=\UTF-8\?
- + doc\n + aE/a\n + bF/b\n + /doc\n;
-
- private static final String xml2 = bB/b\n + /doc\n + doc\n +
aC/a\n + bD/b\n + /doc\n + doc\n + aE/a\n
- + bF/b\n + /doc\n;
-
- private static final String xml3 = doc\n + aA/a\n +
bB/b\n + /doc\n + doc\n + aC/a\n + bD/b\n +
/doc\n
- + doc\n + aE/a\n;
-
- private static final String xml4 = doc + aA/a + bB/b +
/doc + doc + aC/a + bD/b + /doc + doc
- + aE/a + bF/b + /doc;
-
- private static final String xml5 = doc attr=\G\ + aA/a +
bB/b + /doc + doc + aC/a + bD/b + /doc
- + doc attr=\H\/ + doc + aE/a + bF/b + /doc
+ doc attr=\I\/;
-
- private Configuration conf = null;
- private TaskAttemptContext ctx = null;
- private static DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
- private XPathFactory xpFactory = XPathFactory.newInstance();
- private XPathExpression EXPR_A = null;
- private XPathExpression EXPR_B = null;
- private XPathExpression EXPR_ATTR = null;
-
- @Before
- public void setUp() throws Exception {
-conf = new Configuration();
-conf.set(AggregatingRecordReader.START_TOKEN, doc);
-conf.set(AggregatingRecordReader.END_TOKEN, /doc);
-conf.set(AggregatingRecordReader.RETURN_PARTIAL_MATCHES,
Boolean.toString(true));
-ctx = ContextFactory.createTaskAttemptContext(conf);
-XPath xp = xpFactory.newXPath();
-EXPR_A = xp.compile(/doc/a);
-EXPR_B =
[18/37] git commit: ACCUMULO-286 added context factory stuff
ACCUMULO-286 added context factory stuff
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1328104
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 0680b04bf03e2d6ad19ae3c368f6cb23f4e30056)
Reason: Testing
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7fa0085a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7fa0085a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7fa0085a
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 7fa0085a48248e0fcb06ee38064f712026ed9609
Parents: 6bba940
Author: Billie Rinaldi bil...@apache.org
Authored: Thu Apr 19 20:22:16 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../accumulo/core/util/ContextFactory.java | 12 +++---
.../helloworld/InsertWithOutputFormat.java | 4 ++--
.../simple/filedata/ChunkInputFormatTest.java | 6 ++---
.../wikisearch/ingest/WikipediaMapperTest.java | 9 +++-
.../reader/AggregatingRecordReaderTest.java | 24 +++-
.../wikisearch/logic/TestQueryLogic.java| 9
6 files changed, 34 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7fa0085a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
index 61e853d..5a1c2ef 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
@@ -147,15 +147,21 @@ public class ContextFactory {
}
}
- @SuppressWarnings({unchecked, rawtypes})
public static K1,V1,K2,V2 MapperK1,V1,K2,V2.Context
createMapContext(MapperK1,V1,K2,V2 m, TaskAttemptContext tac,
RecordReaderK1,V1 reader,
RecordWriterK2,V2 writer, InputSplit split) {
+return createMapContext(m, tac, reader, writer, null, null, split);
+ }
+
+ @SuppressWarnings({unchecked, rawtypes})
+ public static K1,V1,K2,V2 MapperK1,V1,K2,V2.Context
createMapContext(MapperK1,V1,K2,V2 m, TaskAttemptContext tac,
RecordReaderK1,V1 reader,
+ RecordWriterK2,V2 writer, OutputCommitter committer, StatusReporter
reporter, InputSplit split) {
try {
if (useV21) {
-Object basis =
MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, null, null, split);
+Object basis =
MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, committer, reporter, split);
return (Mapper.Context)
MAP_CONTEXT_CONSTRUCTOR.newInstance((MapperK1,V1,K2,V2)
MAP_CONSTRUCTOR.newInstance(), basis);
} else {
-return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m,
tac.getConfiguration(), tac.getTaskAttemptID(), reader, writer, null, null,
split);
+return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m,
tac.getConfiguration(), tac.getTaskAttemptID(), reader, writer, committer,
reporter,
+split);
}
} catch (InstantiationException e) {
throw new IllegalArgumentException(Can't create object, e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7fa0085a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
--
diff --git
a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
b/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
index af03470..5c37d6c 100644
---
a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
+++
b/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
@@ -45,8 +45,8 @@ public class InsertWithOutputFormat extends Configured
implements Tool {
}
Text tableName = new Text(args[4]);
Job job = new Job(getConf());
-AccumuloOutputFormat.setZooKeeperInstance(job, args[0], args[1]);
-AccumuloOutputFormat.setOutputInfo(job, args[3], args[4].getBytes(), true,
null);
+AccumuloOutputFormat.setZooKeeperInstance(job.getConfiguration(), args[0],
args[1]);
+AccumuloOutputFormat.setOutputInfo(job.getConfiguration(), args[2],
args[3].getBytes(), true, null);
job.setOutputFormatClass(AccumuloOutputFormat.class);
[32/37] git commit: ACCUMULO-645 found another HADOOP_HOME reference
ACCUMULO-645 found another HADOOP_HOME reference
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1433058
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit e7f6e5ff4f80d1f2bfe3f6daf0889d51b5593c6a)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5dd9016a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5dd9016a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5dd9016a
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 5dd9016a1d406618531725e6ce111b59acae72ec
Parents: d16fd77
Author: Eric C. Newton e...@apache.org
Authored: Mon Jan 14 19:11:44 2013 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
.../org/apache/accumulo/start/classloader/AccumuloClassLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5dd9016a/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
--
diff --git
a/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
b/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index fd41938..ff02d13 100644
---
a/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++
b/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -111,7 +111,7 @@ public class AccumuloClassLoader {
+ $ACCUMULO_HOME/lib/[^.].*.jar,\n
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n
+ $HADOOP_PREFIX/[^.].*.jar,\n + $HADOOP_CONF_DIR,\n
- + $HADOOP_HOME/lib/[^.].*.jar,\n;
+ + $HADOOP_PREFIX/lib/[^.].*.jar,\n;
/**
* Dynamic classpath. These locations will be monitored for changes.
[21/37] git commit: ACCUMULO-564 changes for 0.23 compile compatiblity
ACCUMULO-564 changes for 0.23 compile compatiblity
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1332674
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit a5765d111e67b5f1cd645909285f729b902c9b6a)
Reason: Hadoop2 Compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
This is a partial backport from 1.5 that excludes the wiki-search example
portions but includes
changes to Accumulo.java and DefaultServlet.java
A few minor 1.4.3 specific hacks to get compliation to work against hadoop
2.0.2-alpha
- CoordinateRecoveryTask.java and LogSort.java
Author: Jonathan M Hsieh j...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31e4dd15
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31e4dd15
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31e4dd15
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 31e4dd15f5cb8bc85372dd66849e3452bae3ee7f
Parents: 2c83ca3
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Thu May 30 17:41:58 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../src/main/java/org/apache/accumulo/server/Accumulo.java | 1 -
.../apache/accumulo/server/master/CoordinateRecoveryTask.java | 3 +++
.../main/java/org/apache/accumulo/server/master/LogSort.java | 2 +-
.../accumulo/server/monitor/servlets/DefaultServlet.java | 6 +++---
4 files changed, 7 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
--
diff --git a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
index 32462b7..253962b 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -43,7 +43,6 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.xml.DOMConfigurator;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
index 79065a2..64ed42e 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
@@ -257,6 +257,9 @@ public class CoordinateRecoveryTask implements Runnable {
return new RecoveryStatus(logFile.server, logFile.file, (sortJob ==
null ? 0. : sortJob.mapProgress()), (sortJob == null ? 0.
: sortJob.reduceProgress()), (int) (System.currentTimeMillis() -
copyStartTime), (sortJob != null) ? 1. : (copySize == 0 ? 0 : copiedSoFar()
/ (double) copySize));
+ } catch (InterruptedException ie) {
+// Hadoop 2.0.2-alpha's Job.mapProgress throws Interrupted Exception.
1.x and 2.0.4 do not.
+return new RecoveryStatus(logFile.server, logFile.file, 1.0, 1.0,
(int) (System.currentTimeMillis() - copyStartTime), 1.0);
} catch (NullPointerException npe) {
return new RecoveryStatus(logFile.server, logFile.file, 1.0, 1.0,
(int) (System.currentTimeMillis() - copyStartTime), 1.0);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
b/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
index 1e7f29b..006d06e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
@@ -81,8 +81,8 @@ public class LogSort extends Configured implements Tool {
@Override
public void abortTask(TaskAttemptContext context) {
- super.abortTask(context);
try {
+super.abortTask(context);
outputFileSystem.delete(outputPath, true);
} catch (IOException ex) {
[33/37] git commit: ACCUMULO-1792 Update commons-io dependency for Hadoop2.
ACCUMULO-1792 Update commons-io dependency for Hadoop2. Based on the discussion around ACCUMULO-1244, we can update to 2.1 while not marking commons-io as provided to eliminated classpath issues on hadoop 2 and bring a copy in lib/ for hadoop 0.20. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e3967fa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e3967fa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e3967fa Branch: refs/heads/1.4.5-SNAPSHOT Commit: 5e3967fa08a36b386cdd0b40a04b5cd7c1e331de Parents: d5f1657 Author: Sean Busbey bus...@cloudera.com Authored: Mon Oct 28 00:44:46 2013 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5e3967fa/pom.xml -- diff --git a/pom.xml b/pom.xml index e4c06fa..ca550d5 100644 --- a/pom.xml +++ b/pom.xml @@ -786,7 +786,7 @@ dependency groupIdcommons-io/groupId artifactIdcommons-io/artifactId -version1.4/version +version2.1/version /dependency dependency groupIdcommons-collections/groupId
[22/37] git commit: ACCUMULO-804 defend against FileNotFoundExceptions for hadoop-2.0
ACCUMULO-804 defend against FileNotFoundExceptions for hadoop-2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1458344
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit aa0ca4a30fcbae39e33fd0ae7e9c6e5dd44c7cd8)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
only one ref to fs.delete() in GarbageCollectWriteAheadLog
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b1334f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1b1334f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1b1334f5
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 1b1334f5d26bda6a6be435dd277e3eca225a98c3
Parents: ec2aaa6
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Wed May 29 13:57:46 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../apache/accumulo/core/client/ZooKeeperInstance.java | 8 +++-
.../util/shell/commands/ImportDirectoryCommand.java| 13 ++---
.../server/gc/GarbageCollectWriteAheadLogs.java| 3 +++
.../accumulo/server/gc/SimpleGarbageCollector.java | 12 +---
.../accumulo/server/master/tableOps/BulkImport.java| 7 ++-
.../apache/accumulo/server/tabletserver/Tablet.java| 10 +-
6 files changed, 44 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b1334f5/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
b/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index 069d217..fcf8f55 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.core.client;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collections;
@@ -272,7 +273,12 @@ public class ZooKeeperInstance implements Instance {
public static String getInstanceIDFromHdfs(Path instanceDirectory) {
try {
FileSystem fs =
FileUtil.getFileSystem(CachedConfiguration.getInstance(),
AccumuloConfiguration.getSiteConfiguration());
- FileStatus[] files = fs.listStatus(instanceDirectory);
+ FileStatus[] files = null;
+ try {
+files = fs.listStatus(instanceDirectory);
+ } catch (FileNotFoundException ex) {
+// ignored
+ }
log.debug(Trying to read instance id from + instanceDirectory);
if (files == null || files.length == 0) {
log.error(unable obtain instance id at + instanceDirectory);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b1334f5/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
b/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
index 3deefa7..31479a1 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.core.util.shell.commands;
+import java.io.FileNotFoundException;
import java.io.IOException;
import org.apache.accumulo.core.client.AccumuloException;
@@ -45,10 +46,16 @@ public class ImportDirectoryCommand extends Command {
String failureDir = cl.getArgs()[1];
boolean setTime = Boolean.parseBoolean(cl.getArgs()[2]);
-FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
-FileStatus failStatus = fs.getFileStatus(new Path(failureDir));
-if (failStatus == null || !failStatus.isDir() || fs.listStatus(new
Path(failureDir)).length != 0)
+final FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
+FileStatus failStatus = null;
+try {
+ failStatus = fs.getFileStatus(new Path(failureDir));
+} catch (FileNotFoundException ex) {
+ // ignored
+}
+if (failStatus == null || !failStatus.isDir() || fs.listStatus(new
Path(failureDir)).length != 0) {
throw new AccumuloException(failureDir + is not an empty directory);
+}
shellState.getConnector().tableOperations().importDirectory(shellState.getTableName(),
dir, failureDir, setTime);
return 0;
}
[23/37] git commit: ACCUMULO-876 added maven profiles to assist in compiling against different versions of hadoop
ACCUMULO-876 added maven profiles to assist in compiling against different
versions of hadoop
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1419924
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 65c271c2a46b87eb0e4991d7fd7b6fbd7456c0a8)
Reason: Hadoop2 Compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
This patch differs from upstream by fixing poms not in the accumulo 1.5 release
and keeping the 1.4 specific build instructions in the README.
Author: Jonathan Hsieh j...@cloudera.com
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f97284d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f97284d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f97284d
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 0f97284da4c1b33ef1b423003d490e2f81a8
Parents: 31e4dd1
Author: Billie Rinaldi bil...@apache.org
Authored: Tue Dec 11 00:01:39 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
README | 8 +-
pom.xml | 78 +---
src/core/pom.xml| 56 --
src/examples/simple/pom.xml | 50 +++--
src/examples/wikisearch/ingest/pom.xml | 42 +--
src/examples/wikisearch/query/pom.xml | 43 +--
src/minicluster/pom.xml | 41 --
src/proxy/pom.xml | 2 +-
src/server/pom.xml | 50 -
.../server/monitor/servlets/DefaultServlet.java | 64 ++--
src/start/pom.xml | 38 +-
src/trace/pom.xml | 2 +-
12 files changed, 385 insertions(+), 89 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f97284d/README
--
diff --git a/README b/README
index ebe89e4..674769d 100644
--- a/README
+++ b/README
@@ -17,7 +17,13 @@ However, if you only have source code, or you wish to make
changes, you need to
have maven configured to get Accumulo prerequisites from repositories. See
the pom.xml file for the necessary components.
-Run mvn package mvn assembly:single -N
+Run mvn package mvn assembly:single -N. By default,
+Accumulo compiles against Hadoop 1.0.4. To compile against a different version
+that is compatible with Hadoop 1.0, specify hadoop.version on the command line,
+e.g. -Dhadoop.version=0.20.205.0 or -Dhadoop.version=1.1.0. To compile
+against Hadoop 2.0, specify -Dhadoop.profile=2.0. By default this uses
+2.0.2-alpha. To compile against a different 2.0-compatible version, specify
+the profile and version, e.g. -Dhadoop.profile=2.0 -Dhadoop.version=0.23.5.
If you are running on another Unix-like operating system (OSX, etc) then
you may wish to build the native libraries. They are not strictly necessary
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f97284d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9ed2fdf..e4c06fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -640,6 +640,62 @@
/plugins
/build
/profile
+!-- profile for building against Hadoop 1.0.x
+Activate by not specifying hadoop.profile --
+profile
+ idhadoop-1.0/id
+ activation
+property
+ name!hadoop.profile/name
+/property
+ /activation
+ properties
+hadoop.version1.0.4/hadoop.version
+slf4j.version1.4.3/slf4j.version
+ /properties
+ dependencyManagement
+dependencies
+ dependency
+groupIdorg.apache.hadoop/groupId
+artifactIdhadoop-core/artifactId
+version${hadoop.version}/version
+scopeprovided/scope
+ /dependency
+/dependencies
+ /dependencyManagement
+/profile
+!-- profile for building against Hadoop 2.0.x
+Activate using: mvn -Dhadoop.profile=2.0 --
+profile
+ idhadoop-2.0/id
+ activation
+property
+ namehadoop.profile/name
+ value2.0/value
+/property
+ /activation
+ properties
+slf4j.version1.6.1/slf4j.version
+hadoop.version2.0.2-alpha/hadoop.version
+avro.version1.5.3/avro.version
+ /properties
+ dependencyManagement
+dependencies
+ dependency
+groupIdorg.apache.hadoop/groupId
+artifactIdhadoop-client/artifactId
+version${hadoop.version}/version
+
[24/37] git commit: ACCUMULO-804 initial attempt to make accumulo binary compatible with 2.0
ACCUMULO-804 initial attempt to make accumulo binary compatible with 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1483399
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit d6c612d087e7f922c9935888cf443d4a9f1999c2)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2c83ca33
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2c83ca33
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2c83ca33
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 2c83ca337ac54e3c71aff1596bcf6ea04aea6491
Parents: 1b1334f
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Wed May 29 14:23:01 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../accumulo/core/util/TTimeoutTransport.java | 12 -
.../org/apache/accumulo/server/Accumulo.java| 51 ++--
2 files changed, 58 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c83ca33/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
index 3c1fa6a..0aebc39 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
@@ -21,6 +21,7 @@ import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.lang.reflect.Method;
import java.net.Socket;
import java.net.SocketAddress;
import java.nio.channels.spi.SelectorProvider;
@@ -31,12 +32,21 @@ import org.apache.thrift.transport.TTransport;
public class TTimeoutTransport {
+ private static InputStream getInputStream(Socket socket, long timeout) {
+try {
+ Method m = NetUtils.class.getMethod(getInputStream, Socket.class,
Long.TYPE);
+ return (InputStream)m.invoke(null, socket, timeout);
+} catch (Exception e) {
+ throw new RuntimeException(e);
+}
+ }
+
public static TTransport create(SocketAddress addr, long timeoutMillis)
throws IOException {
Socket socket = SelectorProvider.provider().openSocketChannel().socket();
socket.setSoLinger(false, 0);
socket.setTcpNoDelay(true);
socket.connect(addr);
-InputStream input = new
BufferedInputStream(NetUtils.getInputStream(socket, timeoutMillis), 1024 * 10);
+InputStream input = new BufferedInputStream(getInputStream(socket,
timeoutMillis), 1024 * 10);
OutputStream output = new
BufferedOutputStream(NetUtils.getOutputStream(socket, timeoutMillis), 1024 *
10);
return new TIOStreamTransport(input, output);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c83ca33/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
--
diff --git a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
index b2feb5c..32462b7 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Map.Entry;
@@ -212,10 +213,7 @@ public class Accumulo {
while (true) {
try {
FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
-if (!(fs instanceof DistributedFileSystem))
- break;
-DistributedFileSystem dfs = (DistributedFileSystem)
FileSystem.get(CachedConfiguration.getInstance());
-if (!dfs.setSafeMode(SafeModeAction.SAFEMODE_GET))
+if (!isInSafeMode(fs))
break;
log.warn(Waiting for the NameNode to leave safemode);
} catch (IOException ex) {
@@ -227,4 +225,49 @@ public class Accumulo {
}
log.info(Connected to HDFS);
}
+
+ private static boolean isInSafeMode(FileSystem fs) throws IOException {
+if (!(fs instanceof DistributedFileSystem))
+ return false;
+DistributedFileSystem dfs = (DistributedFileSystem)
FileSystem.get(CachedConfiguration.getInstance());
+// So this: if (!dfs.setSafeMode(SafeModeAction.SAFEMODE_GET))
+// Becomes this:
+Class? constantClass;
+try
[20/37] git commit: ACCUMULO-286 introduced ContextFactory to assist with testing InputFormats and OutputFormats under different versions of hadoop
ACCUMULO-286 introduced ContextFactory to assist with testing InputFormats and
OutputFormats under different versions of hadoop
git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk@1229596
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit c0a0afdcceedba2947949761ca13ecc42ff8f9c1)
Reason: Testing
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Expands change to CoordinateRecoveryTask to remove previous addition of
InterruptedException catching in CoordinateRecoveryTask to maintain compile
compatibility with non-2.0.2-alpha versions.
Differs from upstream by expanding test modifications to include depecrated
ones removed in 1.5.x and tests only found in the 1.4.x branch.
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3264e4f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3264e4f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3264e4f
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: a3264e4f1b188e0f4808120fa39d5c1695b6b01c
Parents: 5d22af4
Author: Billie Rinaldi bil...@apache.org
Authored: Tue Jan 10 15:27:57 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../accumulo/core/util/ContextFactory.java | 169 +++
.../mapreduce/AccumuloFileOutputFormatTest.java | 8 +-
.../mapreduce/AccumuloInputFormatTest.java | 71
.../mapreduce/AccumuloRowInputFormatTest.java | 8 +-
.../lib/partition/RangePartitionerTest.java | 5 +-
.../helloworld/InsertWithOutputFormat.java | 10 +-
.../simple/filedata/ChunkInputFormatTest.java | 16 +-
.../server/master/CoordinateRecoveryTask.java | 5 +-
.../apache/accumulo/server/master/LogSort.java | 2 +-
9 files changed, 224 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3264e4f/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
new file mode 100644
index 000..67819da
--- /dev/null
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
@@ -0,0 +1,169 @@
+/**
+ * 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.core.util;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapreduce.InputSplit;
+import org.apache.hadoop.mapreduce.JobContext;
+import org.apache.hadoop.mapreduce.JobID;
+import org.apache.hadoop.mapreduce.MapContext;
+import org.apache.hadoop.mapreduce.Mapper;
+import org.apache.hadoop.mapreduce.OutputCommitter;
+import org.apache.hadoop.mapreduce.RecordReader;
+import org.apache.hadoop.mapreduce.RecordWriter;
+import org.apache.hadoop.mapreduce.StatusReporter;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.TaskAttemptID;
+
+/**
+ * A factory to allow applications to deal with inconsistencies between
MapReduce Context Objects API between hadoop-0.20 and later versions. This code
is based
+ * on org.apache.hadoop.mapreduce.ContextFactory in hadoop-mapred-0.22.0.
+ */
+public class ContextFactory {
+
+ private static final Constructor? JOB_CONTEXT_CONSTRUCTOR;
+ private static final Constructor? TASK_CONTEXT_CONSTRUCTOR;
+ private static final Constructor? TASK_ID_CONSTRUCTOR;
+ private static final Constructor? MAP_CONSTRUCTOR;
+ private static final Constructor? MAP_CONTEXT_CONSTRUCTOR;
+ private static final Constructor? MAP_CONTEXT_IMPL_CONSTRUCTOR;
+ private static final Class? TASK_TYPE_CLASS;
+ private static final boolean useV21;
+
+ static {
+boolean v21 = true;
+final String PACKAGE =
[01/38] git commit: ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility
Updated Branches:
refs/heads/1.5.1-SNAPSHOT f896c9566 - ad9ee5e06
ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1398373
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit ca1494d1508a3b1404ae9989d4211b00aa3ce307)
Reason: Hadoop2 compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc3fdf33
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fc3fdf33
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fc3fdf33
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: fc3fdf33716aa7105e1792c81dfb452fbf8c7944
Parents: aff0d64
Author: Billie Rinaldi bil...@apache.org
Authored: Mon Oct 15 16:32:24 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:41 2013 -0500
--
.../java/org/apache/accumulo/core/util/TTimeoutTransport.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fc3fdf33/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
index 6f74451..3c1fa6a 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
@@ -25,8 +25,7 @@ import java.net.Socket;
import java.net.SocketAddress;
import java.nio.channels.spi.SelectorProvider;
-import org.apache.hadoop.net.SocketInputStream;
-import org.apache.hadoop.net.SocketOutputStream;
+import org.apache.hadoop.net.NetUtils;
import org.apache.thrift.transport.TIOStreamTransport;
import org.apache.thrift.transport.TTransport;
@@ -37,8 +36,8 @@ public class TTimeoutTransport {
socket.setSoLinger(false, 0);
socket.setTcpNoDelay(true);
socket.connect(addr);
-InputStream input = new BufferedInputStream(new SocketInputStream(socket,
timeoutMillis), 1024 * 10);
-OutputStream output = new BufferedOutputStream(new
SocketOutputStream(socket, timeoutMillis), 1024 * 10);
+InputStream input = new
BufferedInputStream(NetUtils.getInputStream(socket, timeoutMillis), 1024 * 10);
+OutputStream output = new
BufferedOutputStream(NetUtils.getOutputStream(socket, timeoutMillis), 1024 *
10);
return new TIOStreamTransport(input, output);
}
}
[02/38] git commit: ACCUMULO-1520 misc functional test fixes
ACCUMULO-1520 misc functional test fixes
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1494361
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 9ac99ea8b402792b36c494c02ac3103e7a061e2a)
Reason: Test
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Hadoop2 by default emits extra logging information to stdout which causes
accumulo's ListTables to emit
extra data to stdout. This filters out these invalid lines ListTables.
Author: Jon Hsieh jmhs...@apache.org
Included the presplit multiplier portion because the LongRowTest has been
failing for me regularly on VMs on 1.4.5-SNAPSHOT and this change makes 1.4.x
consistent with the other active development branches.
Included the search example change for consistency since the rest of hte patch
was applicable.
Author: Sean Busbey bus...@clouderagovt.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aff0d641
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aff0d641
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aff0d641
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: aff0d641274d78a5682defbd5e6d0717aac68546
Parents: 1fe5f7f
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Mon Jun 24 00:36:19 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:41 2013 -0500
--
.../apache/accumulo/server/test/functional/LargeRowTest.java | 2 +-
test/system/auto/TestUtils.py | 5 +
test/system/auto/simple/examples.py| 6 +++---
3 files changed, 9 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
b/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
index bc02929..df98f6e 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
@@ -95,7 +95,7 @@ public class LargeRowTest extends FunctionalTest {
UtilWaitThread.sleep(1);
-checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS);
+checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS * 4);
verify(REG_TABLE_NAME);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index b70677a..b7659a2 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -458,6 +458,11 @@ class TestUtilsMixin:
out,err = handle.communicate()
self.assert_(handle.returncode==0)
for line in out.split('\n') :
+
+# filter out unwanted extra hadoop2 logging
+if line.find(=) 0:
+ continue
+
left, right = line.split(=)
left = left.strip()
right = right.strip()
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/test/system/auto/simple/examples.py
--
diff --git a/test/system/auto/simple/examples.py
b/test/system/auto/simple/examples.py
index b22411a..bed321f 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -80,14 +80,14 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'dataTable',
visibility,
10,
- ACCUMULO_HOME+/src)
+ ACCUMULO_HOME+/test)
self.comment( searching for a file)
handle = self.runOn('localhost', [self.accumulo_sh(),
'org.apache.accumulo.examples.simple.dirlist.QueryUtil',
INSTANCE_NAME, ZOOKEEPERS, ROOT,
ROOT_PASSWORD,
- 'indexTable', auths, 'Fate.java',
'-search'])
+ 'indexTable', auths, 'examples.py',
'-search'])
out, err = handle.communicate()
self.assert_(handle.returncode == 0)
-self.assert_(out.find('accumulo/server/fate/Fate.java') = 0)
+self.assert_(out.find('test/system/auto/simple/examples.py') = 0)
self.comment( found file at + out)
[04/38] ACCUMULO-600 removed wikisearch from trunk
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8db62992/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml -- diff --git a/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml b/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml deleted file mode 100644 index 41d146a..000 --- a/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml +++ /dev/null @@ -1,153 +0,0 @@ -mediawiki xmlns=http://www.mediawiki.org/xml/export-0.5/; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://www.mediawiki.org/xml/export-0.5/ http://www.mediawiki.org/xml/export-0.5.xsd; version=0.5 xml:lang=en - siteinfo -sitenameWikipedia/sitename -basehttp://en.wikipedia.org/wiki/Main_Page/base -generatorMediaWiki 1.17wmf1/generator -casefirst-letter/case -namespaces - namespace key=-2 case=first-letterMedia/namespace - namespace key=-1 case=first-letterSpecial/namespace - namespace key=0 case=first-letter / - namespace key=1 case=first-letterTalk/namespace - namespace key=2 case=first-letterUser/namespace - namespace key=3 case=first-letterUser talk/namespace - namespace key=4 case=first-letterWikipedia/namespace - namespace key=5 case=first-letterWikipedia talk/namespace - namespace key=6 case=first-letterFile/namespace - namespace key=7 case=first-letterFile talk/namespace - namespace key=8 case=first-letterMediaWiki/namespace - namespace key=9 case=first-letterMediaWiki talk/namespace - namespace key=10 case=first-letterTemplate/namespace - namespace key=11 case=first-letterTemplate talk/namespace - namespace key=12 case=first-letterHelp/namespace - namespace key=13 case=first-letterHelp talk/namespace - namespace key=14 case=first-letterCategory/namespace - namespace key=15 case=first-letterCategory talk/namespace - namespace key=100 case=first-letterPortal/namespace - namespace key=101 case=first-letterPortal talk/namespace - namespace key=108 case=first-letterBook/namespace - namespace key=109 case=first-letterBook talk/namespace -/namespaces - /siteinfo - page -titleAbacus/title -id655/id -revision - id34350/id - timestamp2002-02-25T15:43:11Z/timestamp - contributor -ipConversion script/ip - /contributor - minor / - commentAutomated conversion/comment - text xml:space=preserve1. An '''abacus''' is a counting frame, typically wooden with balls sliding on wires. It was first used before the adoption of the ten-digit [[Arabic numerals | Arabic numeral]] system and is still widely used by small merchants in [[China]]. The Roman abacus contains seven long and seven shorter rods or bars, the former having four perforated beads running on them and the latter one. The bar marked 1 indicates units, X tens, and so on up to millions. The beads on the shorter bars denote fives,--five units, five tens, etc. The rod O and corresponding short rod are for marking ounces; and the short quarter rods for fractions of an ounce. Computations are made with it by means of balls of bone or ivory running on slender bamboo rods, similar to the simpler board, fitted up with beads strung on wires, which has been employed in teaching the rudiments of arithmetic in English schools. - -The '''Suan'''4-'''Pan'''2 (amp;#31639;amp;#30436;) of the Chinese closely resembles the Roman abacus in its construction and use. The Chinese abacus is usally around eight inches tall and it comes in various width depending on application, it usually has more than seven rods. There are two beads on each rod in the upper deck and five beads each in the bottom. The beads are usually round and made of hard wood. The abacus can be reset to the starting position instantly by a quick jerk along the horizontal axis to spin all the beads away from the horizontal beam at the center. The beads are counted by moving them up or down towards the beam. Chinese abacus does more than just counting. Unlike the simple counting board used in elimentary schools, very efficient Suan4-Pan2 techniques were developed to do multiplication, division, addition, substraction, square root and cubic root at high speed. The beads and rods were often lubricated to ensure speed. When all five beads in the lower deck are moved up, they are reset to the original position, and one bead in the top deck is moved down as a carry. When both beads in the upper deck are moved down, they are reset and a bead on the adjacent rod on the left is moved up as a carry. The result of the computation is read off from the beads clustered near the separator beam between the upper and lower deck. In a sense, the abacus works as a 5-2-5-2-5-2... based number system in which carries and shiftings are similiar to
[03/38] git commit: ACCUMULO-286 fixed mysteriously broken parameterization in ContextFactory
ACCUMULO-286 fixed mysteriously broken parameterization in ContextFactory
git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk@1229638
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit dd31ed78ac3c7d8965c050b668166d1faa510aa6)
Reason: Testing
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6bba9406
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6bba9406
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6bba9406
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 6bba9406c6dcc08c64149bb6cb801086c15558ee
Parents: 792af9a
Author: Billie Rinaldi bil...@apache.org
Authored: Tue Jan 10 17:01:38 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../java/org/apache/accumulo/core/util/ContextFactory.java| 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bba9406/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
index 67819da..61e853d 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
@@ -147,16 +147,15 @@ public class ContextFactory {
}
}
- @SuppressWarnings(unchecked)
+ @SuppressWarnings({unchecked, rawtypes})
public static K1,V1,K2,V2 MapperK1,V1,K2,V2.Context
createMapContext(MapperK1,V1,K2,V2 m, TaskAttemptContext tac,
RecordReaderK1,V1 reader,
RecordWriterK2,V2 writer, InputSplit split) {
try {
if (useV21) {
Object basis =
MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, null, null, split);
-return (MapperK1,V1,K2,V2.Context)
MAP_CONTEXT_CONSTRUCTOR.newInstance((MapperK1,V1,K2,V2)
MAP_CONSTRUCTOR.newInstance(), basis);
+return (Mapper.Context)
MAP_CONTEXT_CONSTRUCTOR.newInstance((MapperK1,V1,K2,V2)
MAP_CONSTRUCTOR.newInstance(), basis);
} else {
-return (MapperK1,V1,K2,V2.Context)
MAP_CONTEXT_CONSTRUCTOR.newInstance(m, tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, null, null,
-split);
+return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m,
tac.getConfiguration(), tac.getTaskAttemptID(), reader, writer, null, null,
split);
}
} catch (InstantiationException e) {
throw new IllegalArgumentException(Can't create object, e);
[28/38] git commit: ACCUMULO-1876 default for slf4j.version
ACCUMULO-1876 default for slf4j.version Sets default to 1.4.3 as hadoop-1.0 is default in parent pom for 1.5.1-SNAPSHOT (cherry picked from commit c93872afd3e191ea81e353e609749128d3b5c417) Reason: bugfix Author: Michael Wall mjw...@gmail.com Ref: ACCUMULO-1792 Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c0939746 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c0939746 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c0939746 Branch: refs/heads/1.5.1-SNAPSHOT Commit: c093974647a93f70320c5d62eeff00e27fa3149d Parents: 5e3967f Author: Michael Wall mjw...@gmail.com Authored: Fri Nov 15 16:29:46 2013 -0600 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c0939746/pom.xml -- diff --git a/pom.xml b/pom.xml index ca550d5..eda8390 100644 --- a/pom.xml +++ b/pom.xml @@ -868,6 +868,8 @@ properties targetJdk1.6/targetJdk +!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -- +slf4j.version1.4.3/slf4j.version zookeeper.version3.3.1/zookeeper.version /properties
[27/39] git commit: ACCUMULO-1792 Cleanup test* system tests.
ACCUMULO-1792 Cleanup test* system tests. This patch most resembles work done in ACCUMULO-745. 745 is a massive patch applied to Accumulo 1.5 that changed all the command line handling of all of the programs that had main method. When this update was done, several of the concerned addressed in this patch were handled. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/651033a5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/651033a5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/651033a5 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 651033a522f9b1ac51508e60c3cdcd6da02643d8 Parents: 8db6299 Author: Jonathan Hsieh j...@cloudera.com Authored: Sun Jul 7 13:06:27 2013 -0700 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:43 2013 -0500 -- test/system/test1/README | 2 +- test/system/test2/concurrent.sh | 90 +++--- test/system/test3/bigrow.sh | 12 ++-- test/system/test4/bulk_import_test.sh | 32 +-- test/system/test5/insert_test.sh | 18 -- 5 files changed, 68 insertions(+), 86 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/651033a5/test/system/test1/README -- diff --git a/test/system/test1/README b/test/system/test1/README index 4c995fb..8003b3d 100644 --- a/test/system/test1/README +++ b/test/system/test1/README @@ -3,7 +3,7 @@ Command to run from command line #Can run this test with pre-existing splits... use the following command to create the table with #100 pre-existing splits -#../../../bin/accumulo 'org.apache.accumulo.server.test.TestIngest$CreateTable' 0 500 100 +#../../../bin/accumulo 'org.apache.accumulo.server.test.TestIngest$CreateTable' 0 500 100 user pw #could try running verify commands after stopping and restarting accumulo http://git-wip-us.apache.org/repos/asf/accumulo/blob/651033a5/test/system/test2/concurrent.sh -- diff --git a/test/system/test2/concurrent.sh b/test/system/test2/concurrent.sh index 69790a0..1ce9299 100755 --- a/test/system/test2/concurrent.sh +++ b/test/system/test2/concurrent.sh @@ -17,80 +17,80 @@ echo ingesting first halves (0 to (500K - 1), 1M to (1.5M - 1), etc) -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 0 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 100 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 200 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 300 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 400 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 0 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 100 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 200 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 300 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 400 1 wait echo ingesting second halves (500K to (1M - 1), 1.5M to (2M - 1), etc) and verifying first halves -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 0 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 100 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 200 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 300 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 400 1 +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 0 1 +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50
[20/39] git commit: ACCUMULO-286 fixed mysteriously broken parameterization in ContextFactory
ACCUMULO-286 fixed mysteriously broken parameterization in ContextFactory
git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk@1229638
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit dd31ed78ac3c7d8965c050b668166d1faa510aa6)
Reason: Testing
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6bba9406
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6bba9406
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6bba9406
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6bba9406c6dcc08c64149bb6cb801086c15558ee
Parents: 792af9a
Author: Billie Rinaldi bil...@apache.org
Authored: Tue Jan 10 17:01:38 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../java/org/apache/accumulo/core/util/ContextFactory.java| 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bba9406/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
index 67819da..61e853d 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
@@ -147,16 +147,15 @@ public class ContextFactory {
}
}
- @SuppressWarnings(unchecked)
+ @SuppressWarnings({unchecked, rawtypes})
public static K1,V1,K2,V2 MapperK1,V1,K2,V2.Context
createMapContext(MapperK1,V1,K2,V2 m, TaskAttemptContext tac,
RecordReaderK1,V1 reader,
RecordWriterK2,V2 writer, InputSplit split) {
try {
if (useV21) {
Object basis =
MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, null, null, split);
-return (MapperK1,V1,K2,V2.Context)
MAP_CONTEXT_CONSTRUCTOR.newInstance((MapperK1,V1,K2,V2)
MAP_CONSTRUCTOR.newInstance(), basis);
+return (Mapper.Context)
MAP_CONTEXT_CONSTRUCTOR.newInstance((MapperK1,V1,K2,V2)
MAP_CONSTRUCTOR.newInstance(), basis);
} else {
-return (MapperK1,V1,K2,V2.Context)
MAP_CONTEXT_CONSTRUCTOR.newInstance(m, tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, null, null,
-split);
+return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m,
tac.getConfiguration(), tac.getTaskAttemptID(), reader, writer, null, null,
split);
}
} catch (InstantiationException e) {
throw new IllegalArgumentException(Can't create object, e);
[02/39] git commit: ACCUMULO-1520 misc functional test fixes
ACCUMULO-1520 misc functional test fixes
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1494361
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 9ac99ea8b402792b36c494c02ac3103e7a061e2a)
Reason: Test
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Hadoop2 by default emits extra logging information to stdout which causes
accumulo's ListTables to emit
extra data to stdout. This filters out these invalid lines ListTables.
Author: Jon Hsieh jmhs...@apache.org
Included the presplit multiplier portion because the LongRowTest has been
failing for me regularly on VMs on 1.4.5-SNAPSHOT and this change makes 1.4.x
consistent with the other active development branches.
Included the search example change for consistency since the rest of hte patch
was applicable.
Author: Sean Busbey bus...@clouderagovt.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aff0d641
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aff0d641
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aff0d641
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: aff0d641274d78a5682defbd5e6d0717aac68546
Parents: 1fe5f7f
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Mon Jun 24 00:36:19 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:41 2013 -0500
--
.../apache/accumulo/server/test/functional/LargeRowTest.java | 2 +-
test/system/auto/TestUtils.py | 5 +
test/system/auto/simple/examples.py| 6 +++---
3 files changed, 9 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
b/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
index bc02929..df98f6e 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
@@ -95,7 +95,7 @@ public class LargeRowTest extends FunctionalTest {
UtilWaitThread.sleep(1);
-checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS);
+checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS * 4);
verify(REG_TABLE_NAME);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index b70677a..b7659a2 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -458,6 +458,11 @@ class TestUtilsMixin:
out,err = handle.communicate()
self.assert_(handle.returncode==0)
for line in out.split('\n') :
+
+# filter out unwanted extra hadoop2 logging
+if line.find(=) 0:
+ continue
+
left, right = line.split(=)
left = left.strip()
right = right.strip()
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/test/system/auto/simple/examples.py
--
diff --git a/test/system/auto/simple/examples.py
b/test/system/auto/simple/examples.py
index b22411a..bed321f 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -80,14 +80,14 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'dataTable',
visibility,
10,
- ACCUMULO_HOME+/src)
+ ACCUMULO_HOME+/test)
self.comment( searching for a file)
handle = self.runOn('localhost', [self.accumulo_sh(),
'org.apache.accumulo.examples.simple.dirlist.QueryUtil',
INSTANCE_NAME, ZOOKEEPERS, ROOT,
ROOT_PASSWORD,
- 'indexTable', auths, 'Fate.java',
'-search'])
+ 'indexTable', auths, 'examples.py',
'-search'])
out, err = handle.communicate()
self.assert_(handle.returncode == 0)
-self.assert_(out.find('accumulo/server/fate/Fate.java') = 0)
+self.assert_(out.find('test/system/auto/simple/examples.py') = 0)
self.comment( found file at + out)
[34/39] git commit: ACCUMULO-1876 default for slf4j.version
ACCUMULO-1876 default for slf4j.version Sets default to 1.4.3 as hadoop-1.0 is default in parent pom for 1.5.1-SNAPSHOT (cherry picked from commit c93872afd3e191ea81e353e609749128d3b5c417) Reason: bugfix Author: Michael Wall mjw...@gmail.com Ref: ACCUMULO-1792 Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c0939746 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c0939746 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c0939746 Branch: refs/heads/1.6.0-SNAPSHOT Commit: c093974647a93f70320c5d62eeff00e27fa3149d Parents: 5e3967f Author: Michael Wall mjw...@gmail.com Authored: Fri Nov 15 16:29:46 2013 -0600 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c0939746/pom.xml -- diff --git a/pom.xml b/pom.xml index ca550d5..eda8390 100644 --- a/pom.xml +++ b/pom.xml @@ -868,6 +868,8 @@ properties targetJdk1.6/targetJdk +!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -- +slf4j.version1.4.3/slf4j.version zookeeper.version3.3.1/zookeeper.version /properties
[22/39] git commit: ACCUMULO-564 changes for 0.23 compile compatiblity
ACCUMULO-564 changes for 0.23 compile compatiblity
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1332674
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit a5765d111e67b5f1cd645909285f729b902c9b6a)
Reason: Hadoop2 Compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
This is a partial backport from 1.5 that excludes the wiki-search example
portions but includes
changes to Accumulo.java and DefaultServlet.java
A few minor 1.4.3 specific hacks to get compliation to work against hadoop
2.0.2-alpha
- CoordinateRecoveryTask.java and LogSort.java
Author: Jonathan M Hsieh j...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31e4dd15
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31e4dd15
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31e4dd15
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 31e4dd15f5cb8bc85372dd66849e3452bae3ee7f
Parents: 2c83ca3
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Thu May 30 17:41:58 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../src/main/java/org/apache/accumulo/server/Accumulo.java | 1 -
.../apache/accumulo/server/master/CoordinateRecoveryTask.java | 3 +++
.../main/java/org/apache/accumulo/server/master/LogSort.java | 2 +-
.../accumulo/server/monitor/servlets/DefaultServlet.java | 6 +++---
4 files changed, 7 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
--
diff --git a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
index 32462b7..253962b 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -43,7 +43,6 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.xml.DOMConfigurator;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
index 79065a2..64ed42e 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
@@ -257,6 +257,9 @@ public class CoordinateRecoveryTask implements Runnable {
return new RecoveryStatus(logFile.server, logFile.file, (sortJob ==
null ? 0. : sortJob.mapProgress()), (sortJob == null ? 0.
: sortJob.reduceProgress()), (int) (System.currentTimeMillis() -
copyStartTime), (sortJob != null) ? 1. : (copySize == 0 ? 0 : copiedSoFar()
/ (double) copySize));
+ } catch (InterruptedException ie) {
+// Hadoop 2.0.2-alpha's Job.mapProgress throws Interrupted Exception.
1.x and 2.0.4 do not.
+return new RecoveryStatus(logFile.server, logFile.file, 1.0, 1.0,
(int) (System.currentTimeMillis() - copyStartTime), 1.0);
} catch (NullPointerException npe) {
return new RecoveryStatus(logFile.server, logFile.file, 1.0, 1.0,
(int) (System.currentTimeMillis() - copyStartTime), 1.0);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
b/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
index 1e7f29b..006d06e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
@@ -81,8 +81,8 @@ public class LogSort extends Configured implements Tool {
@Override
public void abortTask(TaskAttemptContext context) {
- super.abortTask(context);
try {
+super.abortTask(context);
outputFileSystem.delete(outputPath, true);
} catch (IOException ex) {
[25/39] git commit: ACCUMULO-287 added mock instance to AccumuloOutputFormat - merged to trunk
ACCUMULO-287 added mock instance to AccumuloOutputFormat - merged to trunk
git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk@1229605
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 63545d307599b3f1c1db4884a61fe880911cef7a)
Reason: Testing
Author: Billie Rinaldi bil...@apache.org
merged uncleanly, left in deprecated things removed in 1.5. squashed in test
changes because AccumuloOutputFormatTest got created by ACCUMULO-287
independently in the 1.5 and 1.4 branches
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/792af9a1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/792af9a1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/792af9a1
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 792af9a19133d81edb1e49e9e51407724a53cfc3
Parents: a3264e4
Author: Billie Rinaldi bil...@apache.org
Authored: Tue Jan 10 15:47:22 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../client/mapreduce/AccumuloOutputFormatTest.java | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/792af9a1/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
--
diff --git
a/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
b/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
index 8bc2b45..94e8bf0 100644
---
a/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
+++
b/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
@@ -33,7 +33,7 @@ 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.security.Authorizations;
-import org.apache.hadoop.conf.Configuration;
+import org.apache.accumulo.core.util.ContextFactory;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.mapreduce.Job;
@@ -41,7 +41,6 @@ import org.apache.hadoop.mapreduce.Mapper;
import org.apache.hadoop.mapreduce.RecordReader;
import org.apache.hadoop.mapreduce.RecordWriter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.junit.Test;
/**
@@ -94,11 +93,10 @@ public class AccumuloOutputFormatTest {
job.setOutputKeyClass(Text.class);
job.setOutputValueClass(Mutation.class);
job.setNumReduceTasks(0);
-Configuration conf = job.getConfiguration();
-AccumuloInputFormat.setInputInfo(conf, root, .getBytes(),
testtable1, new Authorizations());
-AccumuloInputFormat.setMockInstance(conf, testmrinstance);
-AccumuloOutputFormat.setOutputInfo(conf, root, .getBytes(), false,
testtable2);
-AccumuloOutputFormat.setMockInstance(conf, testmrinstance);
+AccumuloInputFormat.setInputInfo(job.getConfiguration(), root,
.getBytes(), testtable1, new Authorizations());
+AccumuloInputFormat.setMockInstance(job.getConfiguration(),
testmrinstance);
+AccumuloOutputFormat.setOutputInfo(job, root, .getBytes(), false,
testtable2);
+AccumuloOutputFormat.setMockInstance(job, testmrinstance);
AccumuloInputFormat input = new AccumuloInputFormat();
ListInputSplit splits = input.getSplits(job);
@@ -108,11 +106,10 @@ public class AccumuloOutputFormatTest {
TestMapper mapper = (TestMapper) job.getMapperClass().newInstance();
for (InputSplit split : splits) {
- TaskAttemptID id = new TaskAttemptID();
- TaskAttemptContext tac = new TaskAttemptContext(job.getConfiguration(),
id);
+ TaskAttemptContext tac = ContextFactory.createTaskAttemptContext(job);
RecordReaderKey,Value reader = input.createRecordReader(split, tac);
RecordWriterText,Mutation writer = output.getRecordWriter(tac);
- MapperKey,Value,Text,Mutation.Context context = mapper.new
Context(job.getConfiguration(), id, reader, writer, null, null, split);
+ MapperKey,Value,Text,Mutation.Context context =
ContextFactory.createMapContext(mapper, tac, reader, writer, split);
reader.initialize(split, context);
mapper.run(context);
writer.close(context);
[37/38] git commit: ACCUMULO-645 found another HADOOP_HOME reference
ACCUMULO-645 found another HADOOP_HOME reference
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1433058
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit e7f6e5ff4f80d1f2bfe3f6daf0889d51b5593c6a)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5dd9016a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5dd9016a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5dd9016a
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 5dd9016a1d406618531725e6ce111b59acae72ec
Parents: d16fd77
Author: Eric C. Newton e...@apache.org
Authored: Mon Jan 14 19:11:44 2013 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
.../org/apache/accumulo/start/classloader/AccumuloClassLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5dd9016a/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
--
diff --git
a/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
b/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index fd41938..ff02d13 100644
---
a/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++
b/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -111,7 +111,7 @@ public class AccumuloClassLoader {
+ $ACCUMULO_HOME/lib/[^.].*.jar,\n
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n
+ $HADOOP_PREFIX/[^.].*.jar,\n + $HADOOP_CONF_DIR,\n
- + $HADOOP_HOME/lib/[^.].*.jar,\n;
+ + $HADOOP_PREFIX/lib/[^.].*.jar,\n;
/**
* Dynamic classpath. These locations will be monitored for changes.
[30/39] git commit: ACCUMULO-645 switch to using HADOOP_PREFIX and HADOOP_CONF_DIR
ACCUMULO-645 switch to using HADOOP_PREFIX and HADOOP_CONF_DIR
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1431051
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit b8fdefd91927f82809dfdc4004569f2e223ebdeb)
Reason: Hadoop2 compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/344e7254
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/344e7254
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/344e7254
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 344e725426e76b952d0f390d65ef6062c35fdc03
Parents: 651033a
Author: Eric C. Newton e...@apache.org
Authored: Wed Jan 9 20:43:35 2013 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
bin/config.sh | 16
conf/examples/1GB/native-standalone/accumulo-env.sh | 10 +-
conf/examples/1GB/standalone/accumulo-env.sh| 10 +-
conf/examples/2GB/native-standalone/accumulo-env.sh | 9 -
conf/examples/2GB/standalone/accumulo-env.sh| 10 +-
conf/examples/3GB/native-standalone/accumulo-env.sh | 9 -
conf/examples/3GB/standalone/accumulo-env.sh| 9 -
.../512MB/native-standalone/accumulo-env.sh | 9 -
conf/examples/512MB/standalone/accumulo-env.sh | 9 -
9 files changed, 75 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/344e7254/bin/config.sh
--
diff --git a/bin/config.sh b/bin/config.sh
index 5836b46..d9300d5 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -72,23 +72,23 @@ if [ -z ${ACCUMULO_VERSION} ]; then
ACCUMULO_VERSION=1.4.5-SNAPSHOT
fi
-if [ -z $HADOOP_HOME ]
+if [ -z $HADOOP_PREFIX ]
then
HADOOP_HOME=`which hadoop`
- if [ -z $HADOOP_HOME ]
+ if [ -z $HADOOP_PREFIX ]
then
- echo You must set HADOOP_HOME
+ echo You must set HADOOP_PREFIX
exit 1
fi
- HADOOP_HOME=`dirname $HADOOP_HOME`
- HADOOP_HOME=`dirname $HADOOP_HOME`
+ HADOOP_HOME=`dirname $HADOOP_PREFIX`
+ HADOOP_HOME=`dirname $HADOOP_PREFIX`
fi
-if [ ! -d $HADOOP_HOME ]
+if [ ! -d $HADOOP_PREFIX ]
then
-echo $HADOOP_HOME is not a directory
+echo $HADOOP_PREFIX is not a directory
exit 1
fi
-export HADOOP_HOME
+export HADOOP_PREFIX
if [ ! -f $ACCUMULO_CONF_DIR/masters -o ! -f $ACCUMULO_CONF_DIR/slaves ]
then
http://git-wip-us.apache.org/repos/asf/accumulo/blob/344e7254/conf/examples/1GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh
b/conf/examples/1GB/native-standalone/accumulo-env.sh
index 4033152..15caef6 100755
--- a/conf/examples/1GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/1GB/native-standalone/accumulo-env.sh
@@ -27,9 +27,17 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z $HADOOP_HOME ]
+then
+ test -z $HADOOP_PREFIX export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX=$HADOOP_HOME
+ unset HADOOP_HOME
+fi
+test -z $HADOOP_CONF_DIRexport
HADOOP_CONF_DIR=$HADOOP_PREFIX/conf
+
test -z $JAVA_HOME export JAVA_HOME=/path/to/java
-test -z $HADOOP_HOMEexport HADOOP_HOME=/path/to/hadoop
test -z $ZOOKEEPER_HOME export ZOOKEEPER_HOME=/path/to/zookeeper
test -z $ACCUMULO_LOG_DIR export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
if [ -f ${ACCUMULO_CONF_DIR}/accumulo.policy ]
http://git-wip-us.apache.org/repos/asf/accumulo/blob/344e7254/conf/examples/1GB/standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/standalone/accumulo-env.sh
b/conf/examples/1GB/standalone/accumulo-env.sh
index 4d09467..5c54a39 100755
--- a/conf/examples/1GB/standalone/accumulo-env.sh
+++ b/conf/examples/1GB/standalone/accumulo-env.sh
@@ -27,9 +27,17 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z $HADOOP_HOME ]
+then
+ test -z $HADOOP_PREFIX export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX=$HADOOP_HOME
+ unset HADOOP_HOME
+fi
+test -z $HADOOP_CONF_DIRexport
HADOOP_CONF_DIR=$HADOOP_PREFIX/conf
+
test -z $JAVA_HOME export JAVA_HOME=/path/to/java
-test -z $HADOOP_HOMEexport HADOOP_HOME=/path/to/hadoop
test -z $ZOOKEEPER_HOME export ZOOKEEPER_HOME=/path/to/zookeeper
test -z $ACCUMULO_LOG_DIR export
[39/39] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.1-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/6c80fa50 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c80fa50 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c80fa50 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 6c80fa5038c906ee2f9875c0f3a9c16b9248ecba Parents: f478737 ad9ee5e Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 10:48:03 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 10:48:03 2013 -0500 -- --
[12/39] ACCUMULO-600 removed wikisearch from trunk
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8db62992/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
--
diff --git
a/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
b/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
deleted file mode 100644
index c842da7..000
---
a/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * 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.examples.wikisearch.reader;
-
-import static org.junit.Assert.assertEquals;
-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.FileWriter;
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.accumulo.core.util.ContextFactory;
-import
org.apache.accumulo.examples.wikisearch.ingest.WikipediaInputFormat.WikipediaInputSplit;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.lib.input.FileSplit;
-import org.junit.Before;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public class AggregatingRecordReaderTest {
-
- public static class MyErrorHandler implements ErrorHandler {
-
-@Override
-public void error(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
-@Override
-public void fatalError(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
-@Override
-public void warning(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
- }
-
- private static final String xml1 = ?xml version=\1.0\
encoding=\UTF-8\? + doc\n + aA/a\n + bB/b\n + /doc\n
- + ?xml version=\1.0\ encoding=\UTF-8\? + doc\n +
aC/a\n + bD/b\n + /doc\n + ?xml version=\1.0\
encoding=\UTF-8\?
- + doc\n + aE/a\n + bF/b\n + /doc\n;
-
- private static final String xml2 = bB/b\n + /doc\n + doc\n +
aC/a\n + bD/b\n + /doc\n + doc\n + aE/a\n
- + bF/b\n + /doc\n;
-
- private static final String xml3 = doc\n + aA/a\n +
bB/b\n + /doc\n + doc\n + aC/a\n + bD/b\n +
/doc\n
- + doc\n + aE/a\n;
-
- private static final String xml4 = doc + aA/a + bB/b +
/doc + doc + aC/a + bD/b + /doc + doc
- + aE/a + bF/b + /doc;
-
- private static final String xml5 = doc attr=\G\ + aA/a +
bB/b + /doc + doc + aC/a + bD/b + /doc
- + doc attr=\H\/ + doc + aE/a + bF/b + /doc
+ doc attr=\I\/;
-
- private Configuration conf = null;
- private TaskAttemptContext ctx = null;
- private static DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
- private XPathFactory xpFactory = XPathFactory.newInstance();
- private XPathExpression EXPR_A = null;
- private XPathExpression EXPR_B = null;
- private XPathExpression EXPR_ATTR = null;
-
- @Before
- public void setUp() throws Exception {
-conf = new Configuration();
-conf.set(AggregatingRecordReader.START_TOKEN, doc);
-conf.set(AggregatingRecordReader.END_TOKEN, /doc);
-conf.set(AggregatingRecordReader.RETURN_PARTIAL_MATCHES,
Boolean.toString(true));
-ctx = ContextFactory.createTaskAttemptContext(conf);
-XPath xp = xpFactory.newXPath();
-EXPR_A = xp.compile(/doc/a);
-EXPR_B =
[10/39] ACCUMULO-600 removed wikisearch from trunk
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8db62992/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
--
diff --git
a/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
b/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
deleted file mode 100644
index 87b4da2..000
---
a/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * 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.examples.wikisearch.iterator;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.accumulo.core.data.ByteSequence;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.PartialKey;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.examples.wikisearch.parser.EventFields;
-import org.apache.accumulo.examples.wikisearch.parser.QueryEvaluator;
-import org.apache.commons.jexl2.parser.ParseException;
-import org.apache.log4j.Logger;
-
-
-import com.esotericsoftware.kryo.Kryo;
-
-/**
- *
- * This iterator aggregates rows together using the specified key comparator.
Subclasses will provide their own implementation of fillMap which will fill the
- * supplied EventFields object with field names (key) and field values
(value). After all fields have been put into the aggregated object (by
aggregating all
- * columns with the same key), the EventFields object will be compared against
the supplied expression. If the expression returns true, then the return key and
- * return value can be retrieved via getTopKey() and getTopValue().
- *
- * Optionally, the caller can set an expression (field operator value) that
should not be evaluated against the event. For example, if the query is
- * A == 'foo' and B == 'bar', but for some reason B may not be in the data,
then setting the UNEVALUATED_EXPRESSIONS option to B == 'bar' will allow the
- * events to be evaluated against the remainder of the expression and still
return as true.
- *
- * By default this iterator will return all Events in the shard. If the
START_DATE and END_DATE are specified, then this iterator will evaluate the
timestamp of
- * the key against the start and end dates. If the event date is not within
the range of start to end, then it is skipped.
- *
- * This iterator will return up the stack an EventFields object serialized
using Kryo in the cell Value.
- *
- */
-public abstract class AbstractEvaluatingIterator implements
SortedKeyValueIteratorKey,Value, OptionDescriber {
-
- private static Logger log =
Logger.getLogger(AbstractEvaluatingIterator.class);
- protected static final byte[] NULL_BYTE = new byte[0];
- public static final String QUERY_OPTION = expr;
- public static final String UNEVALUTED_EXPRESSIONS =
unevaluated.expressions;
-
- private PartialKey comparator = null;
- protected SortedKeyValueIteratorKey,Value iterator;
- private Key currentKey = new Key();
- private Key returnKey;
- private Value returnValue;
- private String expression;
- private QueryEvaluator evaluator;
- private EventFields event = null;
- private static Kryo kryo = new Kryo();
- private Range seekRange = null;
- private SetString skipExpressions = null;
-
- protected AbstractEvaluatingIterator(AbstractEvaluatingIterator other,
IteratorEnvironment env) {
-iterator = other.iterator.deepCopy(env);
-event = other.event;
- }
-
- public AbstractEvaluatingIterator() {}
-
- /**
- * Implementations will return
[17/39] git commit: ACCUMULO-804 defend against FileNotFoundExceptions for hadoop-2.0
ACCUMULO-804 defend against FileNotFoundExceptions for hadoop-2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1458344
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit aa0ca4a30fcbae39e33fd0ae7e9c6e5dd44c7cd8)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
only one ref to fs.delete() in GarbageCollectWriteAheadLog
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b1334f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1b1334f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1b1334f5
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1b1334f5d26bda6a6be435dd277e3eca225a98c3
Parents: ec2aaa6
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Wed May 29 13:57:46 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../apache/accumulo/core/client/ZooKeeperInstance.java | 8 +++-
.../util/shell/commands/ImportDirectoryCommand.java| 13 ++---
.../server/gc/GarbageCollectWriteAheadLogs.java| 3 +++
.../accumulo/server/gc/SimpleGarbageCollector.java | 12 +---
.../accumulo/server/master/tableOps/BulkImport.java| 7 ++-
.../apache/accumulo/server/tabletserver/Tablet.java| 10 +-
6 files changed, 44 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b1334f5/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
b/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index 069d217..fcf8f55 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.core.client;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collections;
@@ -272,7 +273,12 @@ public class ZooKeeperInstance implements Instance {
public static String getInstanceIDFromHdfs(Path instanceDirectory) {
try {
FileSystem fs =
FileUtil.getFileSystem(CachedConfiguration.getInstance(),
AccumuloConfiguration.getSiteConfiguration());
- FileStatus[] files = fs.listStatus(instanceDirectory);
+ FileStatus[] files = null;
+ try {
+files = fs.listStatus(instanceDirectory);
+ } catch (FileNotFoundException ex) {
+// ignored
+ }
log.debug(Trying to read instance id from + instanceDirectory);
if (files == null || files.length == 0) {
log.error(unable obtain instance id at + instanceDirectory);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b1334f5/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
b/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
index 3deefa7..31479a1 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.core.util.shell.commands;
+import java.io.FileNotFoundException;
import java.io.IOException;
import org.apache.accumulo.core.client.AccumuloException;
@@ -45,10 +46,16 @@ public class ImportDirectoryCommand extends Command {
String failureDir = cl.getArgs()[1];
boolean setTime = Boolean.parseBoolean(cl.getArgs()[2]);
-FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
-FileStatus failStatus = fs.getFileStatus(new Path(failureDir));
-if (failStatus == null || !failStatus.isDir() || fs.listStatus(new
Path(failureDir)).length != 0)
+final FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
+FileStatus failStatus = null;
+try {
+ failStatus = fs.getFileStatus(new Path(failureDir));
+} catch (FileNotFoundException ex) {
+ // ignored
+}
+if (failStatus == null || !failStatus.isDir() || fs.listStatus(new
Path(failureDir)).length != 0) {
throw new AccumuloException(failureDir + is not an empty directory);
+}
shellState.getConnector().tableOperations().importDirectory(shellState.getTableName(),
dir, failureDir, setTime);
return 0;
}
[27/38] git commit: ACCUMULO-1792 Cleanup test* system tests.
ACCUMULO-1792 Cleanup test* system tests. This patch most resembles work done in ACCUMULO-745. 745 is a massive patch applied to Accumulo 1.5 that changed all the command line handling of all of the programs that had main method. When this update was done, several of the concerned addressed in this patch were handled. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/651033a5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/651033a5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/651033a5 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 651033a522f9b1ac51508e60c3cdcd6da02643d8 Parents: 8db6299 Author: Jonathan Hsieh j...@cloudera.com Authored: Sun Jul 7 13:06:27 2013 -0700 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:43 2013 -0500 -- test/system/test1/README | 2 +- test/system/test2/concurrent.sh | 90 +++--- test/system/test3/bigrow.sh | 12 ++-- test/system/test4/bulk_import_test.sh | 32 +-- test/system/test5/insert_test.sh | 18 -- 5 files changed, 68 insertions(+), 86 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/651033a5/test/system/test1/README -- diff --git a/test/system/test1/README b/test/system/test1/README index 4c995fb..8003b3d 100644 --- a/test/system/test1/README +++ b/test/system/test1/README @@ -3,7 +3,7 @@ Command to run from command line #Can run this test with pre-existing splits... use the following command to create the table with #100 pre-existing splits -#../../../bin/accumulo 'org.apache.accumulo.server.test.TestIngest$CreateTable' 0 500 100 +#../../../bin/accumulo 'org.apache.accumulo.server.test.TestIngest$CreateTable' 0 500 100 user pw #could try running verify commands after stopping and restarting accumulo http://git-wip-us.apache.org/repos/asf/accumulo/blob/651033a5/test/system/test2/concurrent.sh -- diff --git a/test/system/test2/concurrent.sh b/test/system/test2/concurrent.sh index 69790a0..1ce9299 100755 --- a/test/system/test2/concurrent.sh +++ b/test/system/test2/concurrent.sh @@ -17,80 +17,80 @@ echo ingesting first halves (0 to (500K - 1), 1M to (1.5M - 1), etc) -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 0 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 100 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 200 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 300 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 400 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 0 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 100 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 200 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 300 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 400 1 wait echo ingesting second halves (500K to (1M - 1), 1.5M to (2M - 1), etc) and verifying first halves -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 0 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 100 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 200 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 300 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 400 1 +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 0 1 +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50
[13/38] ACCUMULO-600 removed wikisearch from trunk
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8db62992/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
--
diff --git
a/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
b/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
deleted file mode 100644
index c842da7..000
---
a/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * 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.examples.wikisearch.reader;
-
-import static org.junit.Assert.assertEquals;
-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.FileWriter;
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.accumulo.core.util.ContextFactory;
-import
org.apache.accumulo.examples.wikisearch.ingest.WikipediaInputFormat.WikipediaInputSplit;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.lib.input.FileSplit;
-import org.junit.Before;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public class AggregatingRecordReaderTest {
-
- public static class MyErrorHandler implements ErrorHandler {
-
-@Override
-public void error(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
-@Override
-public void fatalError(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
-@Override
-public void warning(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
- }
-
- private static final String xml1 = ?xml version=\1.0\
encoding=\UTF-8\? + doc\n + aA/a\n + bB/b\n + /doc\n
- + ?xml version=\1.0\ encoding=\UTF-8\? + doc\n +
aC/a\n + bD/b\n + /doc\n + ?xml version=\1.0\
encoding=\UTF-8\?
- + doc\n + aE/a\n + bF/b\n + /doc\n;
-
- private static final String xml2 = bB/b\n + /doc\n + doc\n +
aC/a\n + bD/b\n + /doc\n + doc\n + aE/a\n
- + bF/b\n + /doc\n;
-
- private static final String xml3 = doc\n + aA/a\n +
bB/b\n + /doc\n + doc\n + aC/a\n + bD/b\n +
/doc\n
- + doc\n + aE/a\n;
-
- private static final String xml4 = doc + aA/a + bB/b +
/doc + doc + aC/a + bD/b + /doc + doc
- + aE/a + bF/b + /doc;
-
- private static final String xml5 = doc attr=\G\ + aA/a +
bB/b + /doc + doc + aC/a + bD/b + /doc
- + doc attr=\H\/ + doc + aE/a + bF/b + /doc
+ doc attr=\I\/;
-
- private Configuration conf = null;
- private TaskAttemptContext ctx = null;
- private static DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
- private XPathFactory xpFactory = XPathFactory.newInstance();
- private XPathExpression EXPR_A = null;
- private XPathExpression EXPR_B = null;
- private XPathExpression EXPR_ATTR = null;
-
- @Before
- public void setUp() throws Exception {
-conf = new Configuration();
-conf.set(AggregatingRecordReader.START_TOKEN, doc);
-conf.set(AggregatingRecordReader.END_TOKEN, /doc);
-conf.set(AggregatingRecordReader.RETURN_PARTIAL_MATCHES,
Boolean.toString(true));
-ctx = ContextFactory.createTaskAttemptContext(conf);
-XPath xp = xpFactory.newXPath();
-EXPR_A = xp.compile(/doc/a);
-EXPR_B =
[31/39] git commit: ACCUMULO-804 fix the functional tests for hadoop-2.0
ACCUMULO-804 fix the functional tests for hadoop-2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1458388
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 17ef9c25ef2970b02b4771217f4bdf06fa0517a8)
Reason: Hadoop2 Compat
Author: Eric C. Newton
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d5f16575
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d5f16575
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d5f16575
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: d5f16575f721d4fa7977dd1d1e8a9d9e7481b1ab
Parents: 4f7fb04
Author: Sean Busbey bus...@cloudera.com
Authored: Thu Oct 10 13:19:16 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
test/system/auto/TestUtils.py | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d5f16575/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index 0e1bf1a..f6eca67 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -67,6 +67,10 @@ $ACCUMULO_HOME/server/target/classes/,
$HADOOP_CONF_DIR,
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
log = logging.getLogger('test.auto')
[25/38] git commit: ACCUMULO-286 introduced ContextFactory to assist with testing InputFormats and OutputFormats under different versions of hadoop
ACCUMULO-286 introduced ContextFactory to assist with testing InputFormats and
OutputFormats under different versions of hadoop
git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk@1229596
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit c0a0afdcceedba2947949761ca13ecc42ff8f9c1)
Reason: Testing
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Expands change to CoordinateRecoveryTask to remove previous addition of
InterruptedException catching in CoordinateRecoveryTask to maintain compile
compatibility with non-2.0.2-alpha versions.
Differs from upstream by expanding test modifications to include depecrated
ones removed in 1.5.x and tests only found in the 1.4.x branch.
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3264e4f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3264e4f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3264e4f
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: a3264e4f1b188e0f4808120fa39d5c1695b6b01c
Parents: 5d22af4
Author: Billie Rinaldi bil...@apache.org
Authored: Tue Jan 10 15:27:57 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../accumulo/core/util/ContextFactory.java | 169 +++
.../mapreduce/AccumuloFileOutputFormatTest.java | 8 +-
.../mapreduce/AccumuloInputFormatTest.java | 71
.../mapreduce/AccumuloRowInputFormatTest.java | 8 +-
.../lib/partition/RangePartitionerTest.java | 5 +-
.../helloworld/InsertWithOutputFormat.java | 10 +-
.../simple/filedata/ChunkInputFormatTest.java | 16 +-
.../server/master/CoordinateRecoveryTask.java | 5 +-
.../apache/accumulo/server/master/LogSort.java | 2 +-
9 files changed, 224 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3264e4f/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
new file mode 100644
index 000..67819da
--- /dev/null
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
@@ -0,0 +1,169 @@
+/**
+ * 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.core.util;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapreduce.InputSplit;
+import org.apache.hadoop.mapreduce.JobContext;
+import org.apache.hadoop.mapreduce.JobID;
+import org.apache.hadoop.mapreduce.MapContext;
+import org.apache.hadoop.mapreduce.Mapper;
+import org.apache.hadoop.mapreduce.OutputCommitter;
+import org.apache.hadoop.mapreduce.RecordReader;
+import org.apache.hadoop.mapreduce.RecordWriter;
+import org.apache.hadoop.mapreduce.StatusReporter;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.TaskAttemptID;
+
+/**
+ * A factory to allow applications to deal with inconsistencies between
MapReduce Context Objects API between hadoop-0.20 and later versions. This code
is based
+ * on org.apache.hadoop.mapreduce.ContextFactory in hadoop-mapred-0.22.0.
+ */
+public class ContextFactory {
+
+ private static final Constructor? JOB_CONTEXT_CONSTRUCTOR;
+ private static final Constructor? TASK_CONTEXT_CONSTRUCTOR;
+ private static final Constructor? TASK_ID_CONSTRUCTOR;
+ private static final Constructor? MAP_CONSTRUCTOR;
+ private static final Constructor? MAP_CONTEXT_CONSTRUCTOR;
+ private static final Constructor? MAP_CONTEXT_IMPL_CONSTRUCTOR;
+ private static final Class? TASK_TYPE_CLASS;
+ private static final boolean useV21;
+
+ static {
+boolean v21 = true;
+final String PACKAGE =
[34/38] git commit: ACCUMULO-804 fix the functional tests for hadoop-2.0
ACCUMULO-804 fix the functional tests for hadoop-2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1458388
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 17ef9c25ef2970b02b4771217f4bdf06fa0517a8)
Reason: Hadoop2 Compat
Author: Eric C. Newton
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d5f16575
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d5f16575
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d5f16575
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: d5f16575f721d4fa7977dd1d1e8a9d9e7481b1ab
Parents: 4f7fb04
Author: Sean Busbey bus...@cloudera.com
Authored: Thu Oct 10 13:19:16 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
test/system/auto/TestUtils.py | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d5f16575/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index 0e1bf1a..f6eca67 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -67,6 +67,10 @@ $ACCUMULO_HOME/server/target/classes/,
$HADOOP_CONF_DIR,
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
log = logging.getLogger('test.auto')
[24/38] git commit: ACCUMULO-769 Fix Hadoop 2.0 breakage by removing methods marked as deprecated that didn't exist in prior version. ACCUMULO-975 Fix proxy pom.xml to support Hadoop 2.0
ACCUMULO-769 Fix Hadoop 2.0 breakage by removing methods marked as deprecated
that didn't exist in prior version. ACCUMULO-975 Fix proxy pom.xml to support
Hadoop 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1435230
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit ec4055c698d7735093e964e30729ede9df71157f)
Reason: Hadoop2 compat
Author: Christopher Tubbs ctubb...@apache.org
Ref: ACCUMULO-1792
This patch differs from upstream by only including the changes relevant to
ACCUMULO-975. It also does not reformat as much of proxy/pom.xml as the
original.
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c16d8b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c16d8b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4c16d8b8
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 4c16d8b82713cb888e33a224a57d0d41b156b50b
Parents: 0f97284
Author: Sean Busbey bus...@cloudera.com
Authored: Mon Nov 4 15:39:14 2013 -0600
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
src/proxy/pom.xml | 96 ++
1 file changed, 65 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4c16d8b8/src/proxy/pom.xml
--
diff --git a/src/proxy/pom.xml b/src/proxy/pom.xml
index 5d0414d..e1daa29 100644
--- a/src/proxy/pom.xml
+++ b/src/proxy/pom.xml
@@ -33,22 +33,22 @@
build
pluginManagement
plugins
- plugin
- groupIdorg.apache.maven.plugins/groupId
- artifactIdmaven-jar-plugin/artifactId
- configuration
- archive
- manifestSections
- manifestSection
- nameaccumulo/proxy//name
- manifestEntries
- Sealedtrue/Sealed
- /manifestEntries
- /manifestSection
- /manifestSections
- /archive
- /configuration
- /plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-jar-plugin/artifactId
+ configuration
+archive
+ manifestSections
+manifestSection
+ nameaccumulo/proxy//name
+ manifestEntries
+Sealedtrue/Sealed
+ /manifestEntries
+/manifestSection
+ /manifestSections
+/archive
+ /configuration
+/plugin
/plugins
/pluginManagement
plugins
@@ -72,9 +72,9 @@
/build
dependencies
dependency
-groupIdorg.apache.accumulo/groupId
-artifactIdaccumulo-core/artifactId
-scopecompile/scope
+ groupIdorg.apache.accumulo/groupId
+ artifactIdaccumulo-core/artifactId
+ scopecompile/scope
/dependency
dependency
groupIdorg.apache.accumulo/groupId
@@ -82,11 +82,6 @@
scopecompile/scope
/dependency
dependency
-groupIdorg.apache.hadoop/groupId
-artifactIdhadoop-core/artifactId
-scopecompile/scope
-/dependency
-dependency
groupIdorg.apache.zookeeper/groupId
artifactIdzookeeper/artifactId
scopecompile/scope
@@ -113,16 +108,55 @@
scopecompile/scope
/dependency
dependency
- groupIdorg.apache.accumulo/groupId
- artifactIdexamples-simple/artifactId
- version${project.version}/version
- scopetest/scope
+ groupIdorg.apache.accumulo/groupId
+ artifactIdexamples-simple/artifactId
+ version${project.version}/version
+ scopetest/scope
/dependency
dependency
-groupIdorg.apache.accumulo/groupId
-artifactIdaccumulo-server/artifactId
-version${project.version}/version
+ groupIdorg.apache.accumulo/groupId
+ artifactIdaccumulo-server/artifactId
+ version${project.version}/version
/dependency
/dependencies
+ profiles
+!-- profile for building against Hadoop 1.0.x
+Activate by not specifying hadoop.profile --
+profile
+ idhadoop-1.0/id
+ activation
+property
+ name!hadoop.profile/name
+/property
+ /activation
+ dependencies
+dependency
+ groupIdorg.apache.hadoop/groupId
+ artifactIdhadoop-core/artifactId
+/dependency
+ /dependencies
+/profile
+!-- profile for building against Hadoop 2.0.x
+Activate using: mvn -Dhadoop.profile=2.0 --
+
[38/38] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ad9ee5e0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ad9ee5e0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ad9ee5e0 Branch: refs/heads/1.5.1-SNAPSHOT Commit: ad9ee5e06aae970516f2fb9b2400c07c45a94a5a Parents: f896c95 6446ad5 Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 10:46:39 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 10:46:39 2013 -0500 -- --
[21/38] git commit: ACCUMULO-876 added maven profiles to assist in compiling against different versions of hadoop
ACCUMULO-876 added maven profiles to assist in compiling against different
versions of hadoop
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1419924
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 65c271c2a46b87eb0e4991d7fd7b6fbd7456c0a8)
Reason: Hadoop2 Compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
This patch differs from upstream by fixing poms not in the accumulo 1.5 release
and keeping the 1.4 specific build instructions in the README.
Author: Jonathan Hsieh j...@cloudera.com
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f97284d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f97284d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f97284d
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 0f97284da4c1b33ef1b423003d490e2f81a8
Parents: 31e4dd1
Author: Billie Rinaldi bil...@apache.org
Authored: Tue Dec 11 00:01:39 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
README | 8 +-
pom.xml | 78 +---
src/core/pom.xml| 56 --
src/examples/simple/pom.xml | 50 +++--
src/examples/wikisearch/ingest/pom.xml | 42 +--
src/examples/wikisearch/query/pom.xml | 43 +--
src/minicluster/pom.xml | 41 --
src/proxy/pom.xml | 2 +-
src/server/pom.xml | 50 -
.../server/monitor/servlets/DefaultServlet.java | 64 ++--
src/start/pom.xml | 38 +-
src/trace/pom.xml | 2 +-
12 files changed, 385 insertions(+), 89 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f97284d/README
--
diff --git a/README b/README
index ebe89e4..674769d 100644
--- a/README
+++ b/README
@@ -17,7 +17,13 @@ However, if you only have source code, or you wish to make
changes, you need to
have maven configured to get Accumulo prerequisites from repositories. See
the pom.xml file for the necessary components.
-Run mvn package mvn assembly:single -N
+Run mvn package mvn assembly:single -N. By default,
+Accumulo compiles against Hadoop 1.0.4. To compile against a different version
+that is compatible with Hadoop 1.0, specify hadoop.version on the command line,
+e.g. -Dhadoop.version=0.20.205.0 or -Dhadoop.version=1.1.0. To compile
+against Hadoop 2.0, specify -Dhadoop.profile=2.0. By default this uses
+2.0.2-alpha. To compile against a different 2.0-compatible version, specify
+the profile and version, e.g. -Dhadoop.profile=2.0 -Dhadoop.version=0.23.5.
If you are running on another Unix-like operating system (OSX, etc) then
you may wish to build the native libraries. They are not strictly necessary
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f97284d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9ed2fdf..e4c06fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -640,6 +640,62 @@
/plugins
/build
/profile
+!-- profile for building against Hadoop 1.0.x
+Activate by not specifying hadoop.profile --
+profile
+ idhadoop-1.0/id
+ activation
+property
+ name!hadoop.profile/name
+/property
+ /activation
+ properties
+hadoop.version1.0.4/hadoop.version
+slf4j.version1.4.3/slf4j.version
+ /properties
+ dependencyManagement
+dependencies
+ dependency
+groupIdorg.apache.hadoop/groupId
+artifactIdhadoop-core/artifactId
+version${hadoop.version}/version
+scopeprovided/scope
+ /dependency
+/dependencies
+ /dependencyManagement
+/profile
+!-- profile for building against Hadoop 2.0.x
+Activate using: mvn -Dhadoop.profile=2.0 --
+profile
+ idhadoop-2.0/id
+ activation
+property
+ namehadoop.profile/name
+ value2.0/value
+/property
+ /activation
+ properties
+slf4j.version1.6.1/slf4j.version
+hadoop.version2.0.2-alpha/hadoop.version
+avro.version1.5.3/avro.version
+ /properties
+ dependencyManagement
+dependencies
+ dependency
+groupIdorg.apache.hadoop/groupId
+artifactIdhadoop-client/artifactId
+version${hadoop.version}/version
+
[35/38] git commit: ACCUMULO-645: found more references to HADOOP_HOME
ACCUMULO-645: found more references to HADOOP_HOME git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1431596 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 02829fffc3ad9261648da5dd12a02dfcafa5a0fa) Reason: Hadoop2 compat Author: Eric C. Newton e...@apache.org Ref: ACCUMULO-1792 Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d70e5a12 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d70e5a12 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d70e5a12 Branch: refs/heads/1.5.1-SNAPSHOT Commit: d70e5a12739a7775995340be3dca5d460cdf7be2 Parents: 344e725 Author: Eric C. Newton e...@apache.org Authored: Thu Jan 10 20:10:42 2013 + Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- bin/tool.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d70e5a12/bin/tool.sh -- diff --git a/bin/tool.sh b/bin/tool.sh index 3c114e8..cefd6b9 100755 --- a/bin/tool.sh +++ b/bin/tool.sh @@ -20,8 +20,8 @@ bin=`dirname $0` bin=`cd $bin; pwd` . $bin/config.sh -if [ -z $HADOOP_HOME ] ; then -echo HADOOP_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh +if [ -z $HADOOP_PREFIX ] ; then +echo HADOOP_PREFIX is not set. Please make sure it's set globally or in conf/accumulo-env.sh exit 1 fi if [ -z $ZOOKEEPER_HOME ] ; then @@ -98,5 +98,5 @@ fi #echo USERJARS=$USERJARS #echo CLASSNAME=$CLASSNAME #echo HADOOP_CLASSPATH=$HADOOP_CLASSPATH -#echo exec $HADOOP_HOME/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $ARGS -exec $HADOOP_HOME/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $@ +#echo exec $HADOOP_PREFIX/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $ARGS +exec $HADOOP_PREFIX/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $@
[33/38] git commit: ACCUMULO-1876 Add default values for hadoop.version and httpclient.version to make ivy work.
ACCUMULO-1876 Add default values for hadoop.version and httpclient.version to make ivy work. (cherry picked from commit 20cbf248e27069c0c05a595342de73e9ecc43743) Differs from original by changing Hadoop version to match current pom and leaving out dependencies not yet declared in profiles. Reason: bugfix Author: Josh Elser els...@apache.org Ref: ACCUMULO-1792 Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6446ad5c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6446ad5c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6446ad5c Branch: refs/heads/1.5.1-SNAPSHOT Commit: 6446ad5c20fec4b4506a01ac259c26d08974faf4 Parents: c093974 Author: Josh Elser els...@apache.org Authored: Fri Nov 15 16:39:11 2013 -0600 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6446ad5c/pom.xml -- diff --git a/pom.xml b/pom.xml index eda8390..d664a5b 100644 --- a/pom.xml +++ b/pom.xml @@ -869,6 +869,8 @@ properties targetJdk1.6/targetJdk !-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -- +hadoop.version1.0.4/hadoop.version +!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -- slf4j.version1.4.3/slf4j.version zookeeper.version3.3.1/zookeeper.version /properties
[03/39] ACCUMULO-600 removed wikisearch from trunk
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8db62992/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml -- diff --git a/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml b/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml deleted file mode 100644 index 41d146a..000 --- a/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml +++ /dev/null @@ -1,153 +0,0 @@ -mediawiki xmlns=http://www.mediawiki.org/xml/export-0.5/; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://www.mediawiki.org/xml/export-0.5/ http://www.mediawiki.org/xml/export-0.5.xsd; version=0.5 xml:lang=en - siteinfo -sitenameWikipedia/sitename -basehttp://en.wikipedia.org/wiki/Main_Page/base -generatorMediaWiki 1.17wmf1/generator -casefirst-letter/case -namespaces - namespace key=-2 case=first-letterMedia/namespace - namespace key=-1 case=first-letterSpecial/namespace - namespace key=0 case=first-letter / - namespace key=1 case=first-letterTalk/namespace - namespace key=2 case=first-letterUser/namespace - namespace key=3 case=first-letterUser talk/namespace - namespace key=4 case=first-letterWikipedia/namespace - namespace key=5 case=first-letterWikipedia talk/namespace - namespace key=6 case=first-letterFile/namespace - namespace key=7 case=first-letterFile talk/namespace - namespace key=8 case=first-letterMediaWiki/namespace - namespace key=9 case=first-letterMediaWiki talk/namespace - namespace key=10 case=first-letterTemplate/namespace - namespace key=11 case=first-letterTemplate talk/namespace - namespace key=12 case=first-letterHelp/namespace - namespace key=13 case=first-letterHelp talk/namespace - namespace key=14 case=first-letterCategory/namespace - namespace key=15 case=first-letterCategory talk/namespace - namespace key=100 case=first-letterPortal/namespace - namespace key=101 case=first-letterPortal talk/namespace - namespace key=108 case=first-letterBook/namespace - namespace key=109 case=first-letterBook talk/namespace -/namespaces - /siteinfo - page -titleAbacus/title -id655/id -revision - id34350/id - timestamp2002-02-25T15:43:11Z/timestamp - contributor -ipConversion script/ip - /contributor - minor / - commentAutomated conversion/comment - text xml:space=preserve1. An '''abacus''' is a counting frame, typically wooden with balls sliding on wires. It was first used before the adoption of the ten-digit [[Arabic numerals | Arabic numeral]] system and is still widely used by small merchants in [[China]]. The Roman abacus contains seven long and seven shorter rods or bars, the former having four perforated beads running on them and the latter one. The bar marked 1 indicates units, X tens, and so on up to millions. The beads on the shorter bars denote fives,--five units, five tens, etc. The rod O and corresponding short rod are for marking ounces; and the short quarter rods for fractions of an ounce. Computations are made with it by means of balls of bone or ivory running on slender bamboo rods, similar to the simpler board, fitted up with beads strung on wires, which has been employed in teaching the rudiments of arithmetic in English schools. - -The '''Suan'''4-'''Pan'''2 (amp;#31639;amp;#30436;) of the Chinese closely resembles the Roman abacus in its construction and use. The Chinese abacus is usally around eight inches tall and it comes in various width depending on application, it usually has more than seven rods. There are two beads on each rod in the upper deck and five beads each in the bottom. The beads are usually round and made of hard wood. The abacus can be reset to the starting position instantly by a quick jerk along the horizontal axis to spin all the beads away from the horizontal beam at the center. The beads are counted by moving them up or down towards the beam. Chinese abacus does more than just counting. Unlike the simple counting board used in elimentary schools, very efficient Suan4-Pan2 techniques were developed to do multiplication, division, addition, substraction, square root and cubic root at high speed. The beads and rods were often lubricated to ensure speed. When all five beads in the lower deck are moved up, they are reset to the original position, and one bead in the top deck is moved down as a carry. When both beads in the upper deck are moved down, they are reset and a bead on the adjacent rod on the left is moved up as a carry. The result of the computation is read off from the beads clustered near the separator beam between the upper and lower deck. In a sense, the abacus works as a 5-2-5-2-5-2... based number system in which carries and shiftings are similiar to
[23/38] git commit: ACCUMULO-564 changes for 0.23 compile compatiblity
ACCUMULO-564 changes for 0.23 compile compatiblity
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1332674
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit a5765d111e67b5f1cd645909285f729b902c9b6a)
Reason: Hadoop2 Compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
This is a partial backport from 1.5 that excludes the wiki-search example
portions but includes
changes to Accumulo.java and DefaultServlet.java
A few minor 1.4.3 specific hacks to get compliation to work against hadoop
2.0.2-alpha
- CoordinateRecoveryTask.java and LogSort.java
Author: Jonathan M Hsieh j...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31e4dd15
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31e4dd15
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31e4dd15
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 31e4dd15f5cb8bc85372dd66849e3452bae3ee7f
Parents: 2c83ca3
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Thu May 30 17:41:58 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../src/main/java/org/apache/accumulo/server/Accumulo.java | 1 -
.../apache/accumulo/server/master/CoordinateRecoveryTask.java | 3 +++
.../main/java/org/apache/accumulo/server/master/LogSort.java | 2 +-
.../accumulo/server/monitor/servlets/DefaultServlet.java | 6 +++---
4 files changed, 7 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
--
diff --git a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
index 32462b7..253962b 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -43,7 +43,6 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.xml.DOMConfigurator;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
index 79065a2..64ed42e 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
@@ -257,6 +257,9 @@ public class CoordinateRecoveryTask implements Runnable {
return new RecoveryStatus(logFile.server, logFile.file, (sortJob ==
null ? 0. : sortJob.mapProgress()), (sortJob == null ? 0.
: sortJob.reduceProgress()), (int) (System.currentTimeMillis() -
copyStartTime), (sortJob != null) ? 1. : (copySize == 0 ? 0 : copiedSoFar()
/ (double) copySize));
+ } catch (InterruptedException ie) {
+// Hadoop 2.0.2-alpha's Job.mapProgress throws Interrupted Exception.
1.x and 2.0.4 do not.
+return new RecoveryStatus(logFile.server, logFile.file, 1.0, 1.0,
(int) (System.currentTimeMillis() - copyStartTime), 1.0);
} catch (NullPointerException npe) {
return new RecoveryStatus(logFile.server, logFile.file, 1.0, 1.0,
(int) (System.currentTimeMillis() - copyStartTime), 1.0);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
b/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
index 1e7f29b..006d06e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
@@ -81,8 +81,8 @@ public class LogSort extends Configured implements Tool {
@Override
public void abortTask(TaskAttemptContext context) {
- super.abortTask(context);
try {
+super.abortTask(context);
outputFileSystem.delete(outputPath, true);
} catch (IOException ex) {
[33/39] git commit: ACCUMULO-645 found and removed many other references to HADOOP_HOME
ACCUMULO-645 found and removed many other references to HADOOP_HOME
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1433049
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 15f71f96c6850cbc1712e1693307f8f8f978d069)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d16fd77f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d16fd77f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d16fd77f
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: d16fd77fa10afedab3bffe17235a3d700fd8de8e
Parents: d70e5a1
Author: Sean Busbey bus...@cloudera.com
Authored: Sun Oct 27 15:47:25 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
bin/accumulo| 15 +--
bin/config.sh | 6 +++---
.../start/classloader/AccumuloClassLoader.java | 7 ---
test/system/auto/TestUtils.py | 16 ++--
4 files changed, 30 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d16fd77f/bin/accumulo
--
diff --git a/bin/accumulo b/bin/accumulo
index 6642818..bbca3f0 100755
--- a/bin/accumulo
+++ b/bin/accumulo
@@ -48,9 +48,9 @@ if [ -z $JAVA_HOME -o ! -d $JAVA_HOME ]; then
echo JAVA_HOME is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
exit 1
fi
-if [ -z $HADOOP_HOME -o ! -d $HADOOP_HOME ]; then
-echo HADOOP_HOME is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
-exit 1
+if [ -z $HADOOP_PREFIX -o ! -d $HADOOP_PREFIX ]; then
+ echo HADOOP_PREFIX is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
+ exit 1
fi
if [ -z $ZOOKEEPER_HOME -o ! -d $ZOOKEEPER_HOME ]; then
echo ZOOKEEPER_HOME is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
@@ -60,8 +60,11 @@ fi
#Export the variables just in case they are not exported
#This makes them available to java
export JAVA_HOME=$JAVA_HOME
-export HADOOP_HOME=$HADOOP_HOME
+export HADOOP_PREFIX=$HADOOP_PREFIX
export ZOOKEEPER_HOME=$ZOOKEEPER_HOME
+# backwards compatible with old configurations
+export HADOOP_HOME=$HADOOP_PREFIX
+export HADOOP_HOME_WARN_SUPPRESS=1
START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar
COMMONS_JCI_JARS=$ACCUMULO_HOME/lib/commons-jci-core-1.0.jar:$ACCUMULO_HOME/lib/commons-jci-fam-1.0.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar:$ACCUMULO_HOME/lib/commons-logging-1.0.4.jar:$ACCUMULO_HOME/lib/commons-logging-api-1.0.4.jar
@@ -79,7 +82,7 @@ locationByProgram()
}
test -n $JAVA_HOME || export JAVA_HOME=`locationByProgram java`
-test -n $HADOOP_HOME|| export HADOOP_HOME=`locationByProgram hadoop`
+test -n $HADOOP_PREFIX || export HADOOP_PREFIX=`locationByProgram hadoop`
test -n $ZOOKEEPER_HOME || export ZOOKEEPER_HOME=`locationByProgram zkCli.sh`
@@ -130,4 +133,4 @@ JAVA=$JAVA_HOME/bin/java
PLATFORM=`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`
# app isn't used anywhere, but it makes the process easier to spot when
ps/top/snmp truncate the command line
-exec $JAVA -Dapp=$1 -classpath $CLASSPATH $ACCUMULO_OPTS
-XX:OnOutOfMemoryError=${ACCUMULO_KILL_CMD:-kill -9 %p}
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
-Djava.library.path=$HADOOP_HOME/lib/native/$PLATFORM
-Dorg.apache.accumulo.core.home.dir=$ACCUMULO_HOME
-Dhadoop.home.dir=$HADOOP_HOME -Dzookeeper.home.dir=$ZOOKEEPER_HOME
org.apache.accumulo.start.Main $@
+exec $JAVA -Dapp=$1 -classpath $CLASSPATH $ACCUMULO_OPTS
-XX:OnOutOfMemoryError=${ACCUMULO_KILL_CMD:-kill -9 %p}
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
-Djava.library.path=$HADOOP_PREFIX/lib/native/$PLATFORM
-Dorg.apache.accumulo.core.home.dir=$ACCUMULO_HOME
-Dhadoop.home.dir=$HADOOP_PREFIX -Dhadoop.conf.dir=$HADOOP_CONF_DIR
-Dzookeeper.home.dir=$ZOOKEEPER_HOME org.apache.accumulo.start.Main $@
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d16fd77f/bin/config.sh
--
diff --git a/bin/config.sh b/bin/config.sh
index d9300d5..08a8bbd 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -74,14 +74,14 @@ fi
if [ -z $HADOOP_PREFIX ]
then
- HADOOP_HOME=`which hadoop`
+ HADOOP_PREFIX=`which hadoop`
if [ -z $HADOOP_PREFIX ]
then
echo You must set HADOOP_PREFIX
exit 1
fi
- HADOOP_HOME=`dirname $HADOOP_PREFIX`
-
[19/39] git commit: ACCUMULO-804 initial attempt to make accumulo binary compatible with 2.0
ACCUMULO-804 initial attempt to make accumulo binary compatible with 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1483399
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit d6c612d087e7f922c9935888cf443d4a9f1999c2)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2c83ca33
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2c83ca33
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2c83ca33
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 2c83ca337ac54e3c71aff1596bcf6ea04aea6491
Parents: 1b1334f
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Wed May 29 14:23:01 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../accumulo/core/util/TTimeoutTransport.java | 12 -
.../org/apache/accumulo/server/Accumulo.java| 51 ++--
2 files changed, 58 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c83ca33/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
index 3c1fa6a..0aebc39 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
@@ -21,6 +21,7 @@ import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.lang.reflect.Method;
import java.net.Socket;
import java.net.SocketAddress;
import java.nio.channels.spi.SelectorProvider;
@@ -31,12 +32,21 @@ import org.apache.thrift.transport.TTransport;
public class TTimeoutTransport {
+ private static InputStream getInputStream(Socket socket, long timeout) {
+try {
+ Method m = NetUtils.class.getMethod(getInputStream, Socket.class,
Long.TYPE);
+ return (InputStream)m.invoke(null, socket, timeout);
+} catch (Exception e) {
+ throw new RuntimeException(e);
+}
+ }
+
public static TTransport create(SocketAddress addr, long timeoutMillis)
throws IOException {
Socket socket = SelectorProvider.provider().openSocketChannel().socket();
socket.setSoLinger(false, 0);
socket.setTcpNoDelay(true);
socket.connect(addr);
-InputStream input = new
BufferedInputStream(NetUtils.getInputStream(socket, timeoutMillis), 1024 * 10);
+InputStream input = new BufferedInputStream(getInputStream(socket,
timeoutMillis), 1024 * 10);
OutputStream output = new
BufferedOutputStream(NetUtils.getOutputStream(socket, timeoutMillis), 1024 *
10);
return new TIOStreamTransport(input, output);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c83ca33/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
--
diff --git a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
index b2feb5c..32462b7 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Map.Entry;
@@ -212,10 +213,7 @@ public class Accumulo {
while (true) {
try {
FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
-if (!(fs instanceof DistributedFileSystem))
- break;
-DistributedFileSystem dfs = (DistributedFileSystem)
FileSystem.get(CachedConfiguration.getInstance());
-if (!dfs.setSafeMode(SafeModeAction.SAFEMODE_GET))
+if (!isInSafeMode(fs))
break;
log.warn(Waiting for the NameNode to leave safemode);
} catch (IOException ex) {
@@ -227,4 +225,49 @@ public class Accumulo {
}
log.info(Connected to HDFS);
}
+
+ private static boolean isInSafeMode(FileSystem fs) throws IOException {
+if (!(fs instanceof DistributedFileSystem))
+ return false;
+DistributedFileSystem dfs = (DistributedFileSystem)
FileSystem.get(CachedConfiguration.getInstance());
+// So this: if (!dfs.setSafeMode(SafeModeAction.SAFEMODE_GET))
+// Becomes this:
+Class? constantClass;
+try
[29/39] git commit: ACCUMULO-804 pick up the new location of the hadoop jars
ACCUMULO-804 pick up the new location of the hadoop jars
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1456640
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 21780bd2950df7e72a8b1bd3ddef5017b07b63ad)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Skips changes to MiniAccumuloCluster that were already present in backport.
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f7fb04b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f7fb04b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4f7fb04b
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4f7fb04b0b485377daa7d0bd0985994d1ce86173
Parents: 3a35096
Author: Sean Busbey bus...@cloudera.com
Authored: Sun Oct 27 23:24:49 2013 -0400
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
bin/accumulo | 17 +++--
.../1GB/native-standalone/accumulo-env.sh | 2 ++
.../1GB/native-standalone/accumulo-site.xml | 7 +++
conf/examples/1GB/standalone/accumulo-env.sh | 2 ++
conf/examples/1GB/standalone/accumulo-site.xml| 7 +++
.../2GB/native-standalone/accumulo-env.sh | 2 ++
.../2GB/native-standalone/accumulo-site.xml | 7 +++
conf/examples/2GB/standalone/accumulo-env.sh | 2 ++
.../3GB/native-standalone/accumulo-env.sh | 2 ++
.../3GB/native-standalone/accumulo-site.xml | 7 +++
conf/examples/3GB/standalone/accumulo-env.sh | 2 ++
conf/examples/3GB/standalone/accumulo-site.xml| 7 +++
.../512MB/native-standalone/accumulo-env.sh | 2 ++
.../512MB/native-standalone/accumulo-site.xml | 7 +++
conf/examples/512MB/standalone/accumulo-env.sh| 2 ++
conf/examples/512MB/standalone/accumulo-site.xml | 7 +++
.../start/classloader/AccumuloClassLoader.java| 18 --
17 files changed, 92 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/bin/accumulo
--
diff --git a/bin/accumulo b/bin/accumulo
index bbca3f0..e2a89e9 100755
--- a/bin/accumulo
+++ b/bin/accumulo
@@ -131,6 +131,19 @@ CLASSPATH=${XML_FILES}:${START_JAR}:${COMMONS_JCI_JARS}
JAVA=$JAVA_HOME/bin/java
PLATFORM=`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`
-
+# hadoop 1.0, 1.1
+LIB_PATH=$HADOOP_PREFIX/lib/native/$PLATFORM
+if [ ! -d $LIB_PATH ]; then
+ # hadoop-2.0
+ LIB_PATH=$HADOOP_PREFIX/lib/native
+fi
+#
# app isn't used anywhere, but it makes the process easier to spot when
ps/top/snmp truncate the command line
-exec $JAVA -Dapp=$1 -classpath $CLASSPATH $ACCUMULO_OPTS
-XX:OnOutOfMemoryError=${ACCUMULO_KILL_CMD:-kill -9 %p}
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
-Djava.library.path=$HADOOP_PREFIX/lib/native/$PLATFORM
-Dorg.apache.accumulo.core.home.dir=$ACCUMULO_HOME
-Dhadoop.home.dir=$HADOOP_PREFIX -Dhadoop.conf.dir=$HADOOP_CONF_DIR
-Dzookeeper.home.dir=$ZOOKEEPER_HOME org.apache.accumulo.start.Main $@
+exec $JAVA -Dapp=$1 $ACCUMULO_OPTS -classpath $CLASSPATH
-XX:OnOutOfMemoryError=${ACCUMULO_KILL_CMD:-kill -9 %p} \
+
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
\
+ -Djava.library.path=$LIB_PATH \
+ -Dorg.apache.accumulo.core.home.dir=$ACCUMULO_HOME \
+ -Dhadoop.home.dir=$HADOOP_PREFIX \
+ -Dzookeeper.home.dir=$ZOOKEEPER_HOME \
+ org.apache.accumulo.start.Main \
+ $@
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/1GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh
b/conf/examples/1GB/native-standalone/accumulo-env.sh
index 15caef6..e301eb8 100755
--- a/conf/examples/1GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/1GB/native-standalone/accumulo-env.sh
@@ -35,6 +35,8 @@ else
unset HADOOP_HOME
fi
test -z $HADOOP_CONF_DIRexport
HADOOP_CONF_DIR=$HADOOP_PREFIX/conf
+# hadoop-2.0:
+# test -z $HADOOP_CONF_DIR export
HADOOP_CONF_DIR=$HADOOP_PREFIX/etc/hadoop
test -z $JAVA_HOME export JAVA_HOME=/path/to/java
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fb04b/conf/examples/1GB/native-standalone/accumulo-site.xml
--
diff --git a/conf/examples/1GB/native-standalone/accumulo-site.xml
b/conf/examples/1GB/native-standalone/accumulo-site.xml
index 97f70d5..e995bfe 100644
---
[19/38] git commit: ACCUMULO-804 defend against FileNotFoundExceptions for hadoop-2.0
ACCUMULO-804 defend against FileNotFoundExceptions for hadoop-2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1458344
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit aa0ca4a30fcbae39e33fd0ae7e9c6e5dd44c7cd8)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
only one ref to fs.delete() in GarbageCollectWriteAheadLog
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b1334f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1b1334f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1b1334f5
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 1b1334f5d26bda6a6be435dd277e3eca225a98c3
Parents: ec2aaa6
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Wed May 29 13:57:46 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../apache/accumulo/core/client/ZooKeeperInstance.java | 8 +++-
.../util/shell/commands/ImportDirectoryCommand.java| 13 ++---
.../server/gc/GarbageCollectWriteAheadLogs.java| 3 +++
.../accumulo/server/gc/SimpleGarbageCollector.java | 12 +---
.../accumulo/server/master/tableOps/BulkImport.java| 7 ++-
.../apache/accumulo/server/tabletserver/Tablet.java| 10 +-
6 files changed, 44 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b1334f5/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
b/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index 069d217..fcf8f55 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.core.client;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Collections;
@@ -272,7 +273,12 @@ public class ZooKeeperInstance implements Instance {
public static String getInstanceIDFromHdfs(Path instanceDirectory) {
try {
FileSystem fs =
FileUtil.getFileSystem(CachedConfiguration.getInstance(),
AccumuloConfiguration.getSiteConfiguration());
- FileStatus[] files = fs.listStatus(instanceDirectory);
+ FileStatus[] files = null;
+ try {
+files = fs.listStatus(instanceDirectory);
+ } catch (FileNotFoundException ex) {
+// ignored
+ }
log.debug(Trying to read instance id from + instanceDirectory);
if (files == null || files.length == 0) {
log.error(unable obtain instance id at + instanceDirectory);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b1334f5/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
b/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
index 3deefa7..31479a1 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportDirectoryCommand.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.core.util.shell.commands;
+import java.io.FileNotFoundException;
import java.io.IOException;
import org.apache.accumulo.core.client.AccumuloException;
@@ -45,10 +46,16 @@ public class ImportDirectoryCommand extends Command {
String failureDir = cl.getArgs()[1];
boolean setTime = Boolean.parseBoolean(cl.getArgs()[2]);
-FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
-FileStatus failStatus = fs.getFileStatus(new Path(failureDir));
-if (failStatus == null || !failStatus.isDir() || fs.listStatus(new
Path(failureDir)).length != 0)
+final FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
+FileStatus failStatus = null;
+try {
+ failStatus = fs.getFileStatus(new Path(failureDir));
+} catch (FileNotFoundException ex) {
+ // ignored
+}
+if (failStatus == null || !failStatus.isDir() || fs.listStatus(new
Path(failureDir)).length != 0) {
throw new AccumuloException(failureDir + is not an empty directory);
+}
shellState.getConnector().tableOperations().importDirectory(shellState.getTableName(),
dir, failureDir, setTime);
return 0;
}
[24/39] git commit: ACCUMULO-873 removed hdfs info from accumulo monitor page
ACCUMULO-873 removed hdfs info from accumulo monitor page
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1427887
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit e05ca37e5f89b620c990723b2a41396415fdb8b9)
Reason: Polish
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d22af49
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d22af49
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d22af49
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 5d22af4903f49682db98f39d46509f089aeebe86
Parents: 4c16d8b
Author: Billie Rinaldi bil...@apache.org
Authored: Wed Jan 2 18:07:53 2013 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../server/monitor/servlets/DefaultServlet.java | 40
1 file changed, 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d22af49/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
b/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
index 9591d4a..5603f69 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
@@ -50,10 +50,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.ContentSummary;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
-import org.apache.hadoop.hdfs.protocol.FSConstants;
-import org.apache.hadoop.ipc.RemoteException;
public class DefaultServlet extends BasicServlet {
@@ -213,10 +209,6 @@ public class DefaultServlet extends BasicServlet {
sb.append(/td\n);
sb.append(td class='noborder'\n);
-doHdfsTable(sb);
-sb.append(/td\n);
-
-sb.append(td class='noborder'\n);
doZooKeeperTable(sb);
sb.append(/td\n);
@@ -296,38 +288,6 @@ public class DefaultServlet extends BasicServlet {
sb.append(/table\n);
}
- private void doHdfsTable(StringBuilder sb) throws IOException {
-// HDFS
-Configuration conf = CachedConfiguration.getInstance();
-DistributedFileSystem fs = (DistributedFileSystem) FileSystem.get(conf);
-String httpAddress = conf.get(dfs.http.address);
-String port = httpAddress.split(:)[1];
-String href = http://; + fs.getUri().getHost() + : + port;
-String liveUrl = href + /dfsnodelist.jsp?whatNodes=LIVE;
-String deadUrl = href + /dfsnodelist.jsp?whatNodes=DEAD;
-sb.append(table\n);
-sb.append(trth colspan='2'a href=' + href +
'NameNode/a/th/tr\n);
-try {
- boolean highlight = false;
- tableRow(sb, (highlight = !highlight), Unreplicatednbsp;Capacity,
bytes(fs.getRawCapacity()));
- tableRow(sb, (highlight = !highlight), %nbsp;Used,
NumberType.commas(fs.getRawUsed() * 100. / fs.getRawCapacity(), 0, 90, 0, 100)
+ %);
- tableRow(sb, (highlight = !highlight), Corruptnbsp;Blocks,
NumberType.commas(fs.getCorruptBlocksCount(), 0, 0));
- DatanodeInfo[] liveNodes =
fs.getClient().datanodeReport(FSConstants.DatanodeReportType.LIVE);
- DatanodeInfo[] deadNodes =
fs.getClient().datanodeReport(FSConstants.DatanodeReportType.DEAD);
- tableRow(sb, (highlight = !highlight), a href=' + liveUrl +
'Livenbsp;Datanbsp;Nodes/a, NumberType.commas(liveNodes.length));
- tableRow(sb, (highlight = !highlight), a href=' + deadUrl +
'Deadnbsp;Datanbsp;Nodes/a, NumberType.commas(deadNodes.length));
- long count = 0;
- for (DatanodeInfo stat : liveNodes)
-count += stat.getXceiverCount();
- tableRow(sb, (highlight = !highlight), Xceivers,
NumberType.commas(count));
-} catch (RemoteException ex) {
- sb.append(trtd colspan='2'Permissionnbsp;Denied/td/tr\n);
-} catch (Exception ex) {
- sb.append(trtd colspan='2'span
class='error'Down/span/td/tr\n);
-}
-sb.append(/table\n);
- }
-
private void doZooKeeperTable(StringBuilder sb) throws IOException {
// Zookeepers
sb.append(table\n);
[32/38] git commit: ACCUMULO-645 found and removed many other references to HADOOP_HOME
ACCUMULO-645 found and removed many other references to HADOOP_HOME
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1433049
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 15f71f96c6850cbc1712e1693307f8f8f978d069)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d16fd77f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d16fd77f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d16fd77f
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: d16fd77fa10afedab3bffe17235a3d700fd8de8e
Parents: d70e5a1
Author: Sean Busbey bus...@cloudera.com
Authored: Sun Oct 27 15:47:25 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
bin/accumulo| 15 +--
bin/config.sh | 6 +++---
.../start/classloader/AccumuloClassLoader.java | 7 ---
test/system/auto/TestUtils.py | 16 ++--
4 files changed, 30 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d16fd77f/bin/accumulo
--
diff --git a/bin/accumulo b/bin/accumulo
index 6642818..bbca3f0 100755
--- a/bin/accumulo
+++ b/bin/accumulo
@@ -48,9 +48,9 @@ if [ -z $JAVA_HOME -o ! -d $JAVA_HOME ]; then
echo JAVA_HOME is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
exit 1
fi
-if [ -z $HADOOP_HOME -o ! -d $HADOOP_HOME ]; then
-echo HADOOP_HOME is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
-exit 1
+if [ -z $HADOOP_PREFIX -o ! -d $HADOOP_PREFIX ]; then
+ echo HADOOP_PREFIX is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
+ exit 1
fi
if [ -z $ZOOKEEPER_HOME -o ! -d $ZOOKEEPER_HOME ]; then
echo ZOOKEEPER_HOME is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
@@ -60,8 +60,11 @@ fi
#Export the variables just in case they are not exported
#This makes them available to java
export JAVA_HOME=$JAVA_HOME
-export HADOOP_HOME=$HADOOP_HOME
+export HADOOP_PREFIX=$HADOOP_PREFIX
export ZOOKEEPER_HOME=$ZOOKEEPER_HOME
+# backwards compatible with old configurations
+export HADOOP_HOME=$HADOOP_PREFIX
+export HADOOP_HOME_WARN_SUPPRESS=1
START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar
COMMONS_JCI_JARS=$ACCUMULO_HOME/lib/commons-jci-core-1.0.jar:$ACCUMULO_HOME/lib/commons-jci-fam-1.0.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar:$ACCUMULO_HOME/lib/commons-logging-1.0.4.jar:$ACCUMULO_HOME/lib/commons-logging-api-1.0.4.jar
@@ -79,7 +82,7 @@ locationByProgram()
}
test -n $JAVA_HOME || export JAVA_HOME=`locationByProgram java`
-test -n $HADOOP_HOME|| export HADOOP_HOME=`locationByProgram hadoop`
+test -n $HADOOP_PREFIX || export HADOOP_PREFIX=`locationByProgram hadoop`
test -n $ZOOKEEPER_HOME || export ZOOKEEPER_HOME=`locationByProgram zkCli.sh`
@@ -130,4 +133,4 @@ JAVA=$JAVA_HOME/bin/java
PLATFORM=`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`
# app isn't used anywhere, but it makes the process easier to spot when
ps/top/snmp truncate the command line
-exec $JAVA -Dapp=$1 -classpath $CLASSPATH $ACCUMULO_OPTS
-XX:OnOutOfMemoryError=${ACCUMULO_KILL_CMD:-kill -9 %p}
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
-Djava.library.path=$HADOOP_HOME/lib/native/$PLATFORM
-Dorg.apache.accumulo.core.home.dir=$ACCUMULO_HOME
-Dhadoop.home.dir=$HADOOP_HOME -Dzookeeper.home.dir=$ZOOKEEPER_HOME
org.apache.accumulo.start.Main $@
+exec $JAVA -Dapp=$1 -classpath $CLASSPATH $ACCUMULO_OPTS
-XX:OnOutOfMemoryError=${ACCUMULO_KILL_CMD:-kill -9 %p}
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
-Djava.library.path=$HADOOP_PREFIX/lib/native/$PLATFORM
-Dorg.apache.accumulo.core.home.dir=$ACCUMULO_HOME
-Dhadoop.home.dir=$HADOOP_PREFIX -Dhadoop.conf.dir=$HADOOP_CONF_DIR
-Dzookeeper.home.dir=$ZOOKEEPER_HOME org.apache.accumulo.start.Main $@
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d16fd77f/bin/config.sh
--
diff --git a/bin/config.sh b/bin/config.sh
index d9300d5..08a8bbd 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -74,14 +74,14 @@ fi
if [ -z $HADOOP_PREFIX ]
then
- HADOOP_HOME=`which hadoop`
+ HADOOP_PREFIX=`which hadoop`
if [ -z $HADOOP_PREFIX ]
then
echo You must set HADOOP_PREFIX
exit 1
fi
- HADOOP_HOME=`dirname $HADOOP_PREFIX`
-
[26/39] git commit: ACCUMULO-286 introduced ContextFactory to assist with testing InputFormats and OutputFormats under different versions of hadoop
ACCUMULO-286 introduced ContextFactory to assist with testing InputFormats and
OutputFormats under different versions of hadoop
git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk@1229596
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit c0a0afdcceedba2947949761ca13ecc42ff8f9c1)
Reason: Testing
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Expands change to CoordinateRecoveryTask to remove previous addition of
InterruptedException catching in CoordinateRecoveryTask to maintain compile
compatibility with non-2.0.2-alpha versions.
Differs from upstream by expanding test modifications to include depecrated
ones removed in 1.5.x and tests only found in the 1.4.x branch.
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3264e4f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3264e4f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3264e4f
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a3264e4f1b188e0f4808120fa39d5c1695b6b01c
Parents: 5d22af4
Author: Billie Rinaldi bil...@apache.org
Authored: Tue Jan 10 15:27:57 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../accumulo/core/util/ContextFactory.java | 169 +++
.../mapreduce/AccumuloFileOutputFormatTest.java | 8 +-
.../mapreduce/AccumuloInputFormatTest.java | 71
.../mapreduce/AccumuloRowInputFormatTest.java | 8 +-
.../lib/partition/RangePartitionerTest.java | 5 +-
.../helloworld/InsertWithOutputFormat.java | 10 +-
.../simple/filedata/ChunkInputFormatTest.java | 16 +-
.../server/master/CoordinateRecoveryTask.java | 5 +-
.../apache/accumulo/server/master/LogSort.java | 2 +-
9 files changed, 224 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3264e4f/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
new file mode 100644
index 000..67819da
--- /dev/null
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
@@ -0,0 +1,169 @@
+/**
+ * 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.core.util;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapreduce.InputSplit;
+import org.apache.hadoop.mapreduce.JobContext;
+import org.apache.hadoop.mapreduce.JobID;
+import org.apache.hadoop.mapreduce.MapContext;
+import org.apache.hadoop.mapreduce.Mapper;
+import org.apache.hadoop.mapreduce.OutputCommitter;
+import org.apache.hadoop.mapreduce.RecordReader;
+import org.apache.hadoop.mapreduce.RecordWriter;
+import org.apache.hadoop.mapreduce.StatusReporter;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.hadoop.mapreduce.TaskAttemptID;
+
+/**
+ * A factory to allow applications to deal with inconsistencies between
MapReduce Context Objects API between hadoop-0.20 and later versions. This code
is based
+ * on org.apache.hadoop.mapreduce.ContextFactory in hadoop-mapred-0.22.0.
+ */
+public class ContextFactory {
+
+ private static final Constructor? JOB_CONTEXT_CONSTRUCTOR;
+ private static final Constructor? TASK_CONTEXT_CONSTRUCTOR;
+ private static final Constructor? TASK_ID_CONSTRUCTOR;
+ private static final Constructor? MAP_CONSTRUCTOR;
+ private static final Constructor? MAP_CONTEXT_CONSTRUCTOR;
+ private static final Constructor? MAP_CONTEXT_IMPL_CONSTRUCTOR;
+ private static final Class? TASK_TYPE_CLASS;
+ private static final boolean useV21;
+
+ static {
+boolean v21 = true;
+final String PACKAGE =
[36/38] git commit: ACCUMULO-1792 Update commons-io dependency for Hadoop2.
ACCUMULO-1792 Update commons-io dependency for Hadoop2. Based on the discussion around ACCUMULO-1244, we can update to 2.1 while not marking commons-io as provided to eliminated classpath issues on hadoop 2 and bring a copy in lib/ for hadoop 0.20. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e3967fa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e3967fa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e3967fa Branch: refs/heads/1.5.1-SNAPSHOT Commit: 5e3967fa08a36b386cdd0b40a04b5cd7c1e331de Parents: d5f1657 Author: Sean Busbey bus...@cloudera.com Authored: Mon Oct 28 00:44:46 2013 -0400 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5e3967fa/pom.xml -- diff --git a/pom.xml b/pom.xml index e4c06fa..ca550d5 100644 --- a/pom.xml +++ b/pom.xml @@ -786,7 +786,7 @@ dependency groupIdcommons-io/groupId artifactIdcommons-io/artifactId -version1.4/version +version2.1/version /dependency dependency groupIdcommons-collections/groupId
[16/39] git commit: ACCUMULO-286 added context factory stuff
ACCUMULO-286 added context factory stuff
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1328104
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 0680b04bf03e2d6ad19ae3c368f6cb23f4e30056)
Reason: Testing
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7fa0085a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7fa0085a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7fa0085a
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7fa0085a48248e0fcb06ee38064f712026ed9609
Parents: 6bba940
Author: Billie Rinaldi bil...@apache.org
Authored: Thu Apr 19 20:22:16 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../accumulo/core/util/ContextFactory.java | 12 +++---
.../helloworld/InsertWithOutputFormat.java | 4 ++--
.../simple/filedata/ChunkInputFormatTest.java | 6 ++---
.../wikisearch/ingest/WikipediaMapperTest.java | 9 +++-
.../reader/AggregatingRecordReaderTest.java | 24 +++-
.../wikisearch/logic/TestQueryLogic.java| 9
6 files changed, 34 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7fa0085a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
index 61e853d..5a1c2ef 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
@@ -147,15 +147,21 @@ public class ContextFactory {
}
}
- @SuppressWarnings({unchecked, rawtypes})
public static K1,V1,K2,V2 MapperK1,V1,K2,V2.Context
createMapContext(MapperK1,V1,K2,V2 m, TaskAttemptContext tac,
RecordReaderK1,V1 reader,
RecordWriterK2,V2 writer, InputSplit split) {
+return createMapContext(m, tac, reader, writer, null, null, split);
+ }
+
+ @SuppressWarnings({unchecked, rawtypes})
+ public static K1,V1,K2,V2 MapperK1,V1,K2,V2.Context
createMapContext(MapperK1,V1,K2,V2 m, TaskAttemptContext tac,
RecordReaderK1,V1 reader,
+ RecordWriterK2,V2 writer, OutputCommitter committer, StatusReporter
reporter, InputSplit split) {
try {
if (useV21) {
-Object basis =
MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, null, null, split);
+Object basis =
MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, committer, reporter, split);
return (Mapper.Context)
MAP_CONTEXT_CONSTRUCTOR.newInstance((MapperK1,V1,K2,V2)
MAP_CONSTRUCTOR.newInstance(), basis);
} else {
-return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m,
tac.getConfiguration(), tac.getTaskAttemptID(), reader, writer, null, null,
split);
+return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m,
tac.getConfiguration(), tac.getTaskAttemptID(), reader, writer, committer,
reporter,
+split);
}
} catch (InstantiationException e) {
throw new IllegalArgumentException(Can't create object, e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7fa0085a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
--
diff --git
a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
b/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
index af03470..5c37d6c 100644
---
a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
+++
b/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
@@ -45,8 +45,8 @@ public class InsertWithOutputFormat extends Configured
implements Tool {
}
Text tableName = new Text(args[4]);
Job job = new Job(getConf());
-AccumuloOutputFormat.setZooKeeperInstance(job, args[0], args[1]);
-AccumuloOutputFormat.setOutputInfo(job, args[3], args[4].getBytes(), true,
null);
+AccumuloOutputFormat.setZooKeeperInstance(job.getConfiguration(), args[0],
args[1]);
+AccumuloOutputFormat.setOutputInfo(job.getConfiguration(), args[2],
args[3].getBytes(), true, null);
job.setOutputFormatClass(AccumuloOutputFormat.class);
[21/39] git commit: ACCUMULO-769 Fix Hadoop 2.0 breakage by removing methods marked as deprecated that didn't exist in prior version. ACCUMULO-975 Fix proxy pom.xml to support Hadoop 2.0
ACCUMULO-769 Fix Hadoop 2.0 breakage by removing methods marked as deprecated
that didn't exist in prior version. ACCUMULO-975 Fix proxy pom.xml to support
Hadoop 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1435230
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit ec4055c698d7735093e964e30729ede9df71157f)
Reason: Hadoop2 compat
Author: Christopher Tubbs ctubb...@apache.org
Ref: ACCUMULO-1792
This patch differs from upstream by only including the changes relevant to
ACCUMULO-975. It also does not reformat as much of proxy/pom.xml as the
original.
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c16d8b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c16d8b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4c16d8b8
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4c16d8b82713cb888e33a224a57d0d41b156b50b
Parents: 0f97284
Author: Sean Busbey bus...@cloudera.com
Authored: Mon Nov 4 15:39:14 2013 -0600
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
src/proxy/pom.xml | 96 ++
1 file changed, 65 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4c16d8b8/src/proxy/pom.xml
--
diff --git a/src/proxy/pom.xml b/src/proxy/pom.xml
index 5d0414d..e1daa29 100644
--- a/src/proxy/pom.xml
+++ b/src/proxy/pom.xml
@@ -33,22 +33,22 @@
build
pluginManagement
plugins
- plugin
- groupIdorg.apache.maven.plugins/groupId
- artifactIdmaven-jar-plugin/artifactId
- configuration
- archive
- manifestSections
- manifestSection
- nameaccumulo/proxy//name
- manifestEntries
- Sealedtrue/Sealed
- /manifestEntries
- /manifestSection
- /manifestSections
- /archive
- /configuration
- /plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-jar-plugin/artifactId
+ configuration
+archive
+ manifestSections
+manifestSection
+ nameaccumulo/proxy//name
+ manifestEntries
+Sealedtrue/Sealed
+ /manifestEntries
+/manifestSection
+ /manifestSections
+/archive
+ /configuration
+/plugin
/plugins
/pluginManagement
plugins
@@ -72,9 +72,9 @@
/build
dependencies
dependency
-groupIdorg.apache.accumulo/groupId
-artifactIdaccumulo-core/artifactId
-scopecompile/scope
+ groupIdorg.apache.accumulo/groupId
+ artifactIdaccumulo-core/artifactId
+ scopecompile/scope
/dependency
dependency
groupIdorg.apache.accumulo/groupId
@@ -82,11 +82,6 @@
scopecompile/scope
/dependency
dependency
-groupIdorg.apache.hadoop/groupId
-artifactIdhadoop-core/artifactId
-scopecompile/scope
-/dependency
-dependency
groupIdorg.apache.zookeeper/groupId
artifactIdzookeeper/artifactId
scopecompile/scope
@@ -113,16 +108,55 @@
scopecompile/scope
/dependency
dependency
- groupIdorg.apache.accumulo/groupId
- artifactIdexamples-simple/artifactId
- version${project.version}/version
- scopetest/scope
+ groupIdorg.apache.accumulo/groupId
+ artifactIdexamples-simple/artifactId
+ version${project.version}/version
+ scopetest/scope
/dependency
dependency
-groupIdorg.apache.accumulo/groupId
-artifactIdaccumulo-server/artifactId
-version${project.version}/version
+ groupIdorg.apache.accumulo/groupId
+ artifactIdaccumulo-server/artifactId
+ version${project.version}/version
/dependency
/dependencies
+ profiles
+!-- profile for building against Hadoop 1.0.x
+Activate by not specifying hadoop.profile --
+profile
+ idhadoop-1.0/id
+ activation
+property
+ name!hadoop.profile/name
+/property
+ /activation
+ dependencies
+dependency
+ groupIdorg.apache.hadoop/groupId
+ artifactIdhadoop-core/artifactId
+/dependency
+ /dependencies
+/profile
+!-- profile for building against Hadoop 2.0.x
+Activate using: mvn -Dhadoop.profile=2.0 --
+
[17/38] git commit: ACCUMULO-286 added context factory stuff
ACCUMULO-286 added context factory stuff
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1328104
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 0680b04bf03e2d6ad19ae3c368f6cb23f4e30056)
Reason: Testing
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7fa0085a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7fa0085a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7fa0085a
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 7fa0085a48248e0fcb06ee38064f712026ed9609
Parents: 6bba940
Author: Billie Rinaldi bil...@apache.org
Authored: Thu Apr 19 20:22:16 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../accumulo/core/util/ContextFactory.java | 12 +++---
.../helloworld/InsertWithOutputFormat.java | 4 ++--
.../simple/filedata/ChunkInputFormatTest.java | 6 ++---
.../wikisearch/ingest/WikipediaMapperTest.java | 9 +++-
.../reader/AggregatingRecordReaderTest.java | 24 +++-
.../wikisearch/logic/TestQueryLogic.java| 9
6 files changed, 34 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7fa0085a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
index 61e853d..5a1c2ef 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
@@ -147,15 +147,21 @@ public class ContextFactory {
}
}
- @SuppressWarnings({unchecked, rawtypes})
public static K1,V1,K2,V2 MapperK1,V1,K2,V2.Context
createMapContext(MapperK1,V1,K2,V2 m, TaskAttemptContext tac,
RecordReaderK1,V1 reader,
RecordWriterK2,V2 writer, InputSplit split) {
+return createMapContext(m, tac, reader, writer, null, null, split);
+ }
+
+ @SuppressWarnings({unchecked, rawtypes})
+ public static K1,V1,K2,V2 MapperK1,V1,K2,V2.Context
createMapContext(MapperK1,V1,K2,V2 m, TaskAttemptContext tac,
RecordReaderK1,V1 reader,
+ RecordWriterK2,V2 writer, OutputCommitter committer, StatusReporter
reporter, InputSplit split) {
try {
if (useV21) {
-Object basis =
MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, null, null, split);
+Object basis =
MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, committer, reporter, split);
return (Mapper.Context)
MAP_CONTEXT_CONSTRUCTOR.newInstance((MapperK1,V1,K2,V2)
MAP_CONSTRUCTOR.newInstance(), basis);
} else {
-return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m,
tac.getConfiguration(), tac.getTaskAttemptID(), reader, writer, null, null,
split);
+return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m,
tac.getConfiguration(), tac.getTaskAttemptID(), reader, writer, committer,
reporter,
+split);
}
} catch (InstantiationException e) {
throw new IllegalArgumentException(Can't create object, e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7fa0085a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
--
diff --git
a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
b/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
index af03470..5c37d6c 100644
---
a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
+++
b/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
@@ -45,8 +45,8 @@ public class InsertWithOutputFormat extends Configured
implements Tool {
}
Text tableName = new Text(args[4]);
Job job = new Job(getConf());
-AccumuloOutputFormat.setZooKeeperInstance(job, args[0], args[1]);
-AccumuloOutputFormat.setOutputInfo(job, args[3], args[4].getBytes(), true,
null);
+AccumuloOutputFormat.setZooKeeperInstance(job.getConfiguration(), args[0],
args[1]);
+AccumuloOutputFormat.setOutputInfo(job.getConfiguration(), args[2],
args[3].getBytes(), true, null);
job.setOutputFormatClass(AccumuloOutputFormat.class);
[22/38] git commit: ACCUMULO-804 initial attempt to make accumulo binary compatible with 2.0
ACCUMULO-804 initial attempt to make accumulo binary compatible with 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1483399
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit d6c612d087e7f922c9935888cf443d4a9f1999c2)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2c83ca33
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2c83ca33
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2c83ca33
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 2c83ca337ac54e3c71aff1596bcf6ea04aea6491
Parents: 1b1334f
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Wed May 29 14:23:01 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../accumulo/core/util/TTimeoutTransport.java | 12 -
.../org/apache/accumulo/server/Accumulo.java| 51 ++--
2 files changed, 58 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c83ca33/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
index 3c1fa6a..0aebc39 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
@@ -21,6 +21,7 @@ import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.lang.reflect.Method;
import java.net.Socket;
import java.net.SocketAddress;
import java.nio.channels.spi.SelectorProvider;
@@ -31,12 +32,21 @@ import org.apache.thrift.transport.TTransport;
public class TTimeoutTransport {
+ private static InputStream getInputStream(Socket socket, long timeout) {
+try {
+ Method m = NetUtils.class.getMethod(getInputStream, Socket.class,
Long.TYPE);
+ return (InputStream)m.invoke(null, socket, timeout);
+} catch (Exception e) {
+ throw new RuntimeException(e);
+}
+ }
+
public static TTransport create(SocketAddress addr, long timeoutMillis)
throws IOException {
Socket socket = SelectorProvider.provider().openSocketChannel().socket();
socket.setSoLinger(false, 0);
socket.setTcpNoDelay(true);
socket.connect(addr);
-InputStream input = new
BufferedInputStream(NetUtils.getInputStream(socket, timeoutMillis), 1024 * 10);
+InputStream input = new BufferedInputStream(getInputStream(socket,
timeoutMillis), 1024 * 10);
OutputStream output = new
BufferedOutputStream(NetUtils.getOutputStream(socket, timeoutMillis), 1024 *
10);
return new TIOStreamTransport(input, output);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c83ca33/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
--
diff --git a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
index b2feb5c..32462b7 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Map.Entry;
@@ -212,10 +213,7 @@ public class Accumulo {
while (true) {
try {
FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
-if (!(fs instanceof DistributedFileSystem))
- break;
-DistributedFileSystem dfs = (DistributedFileSystem)
FileSystem.get(CachedConfiguration.getInstance());
-if (!dfs.setSafeMode(SafeModeAction.SAFEMODE_GET))
+if (!isInSafeMode(fs))
break;
log.warn(Waiting for the NameNode to leave safemode);
} catch (IOException ex) {
@@ -227,4 +225,49 @@ public class Accumulo {
}
log.info(Connected to HDFS);
}
+
+ private static boolean isInSafeMode(FileSystem fs) throws IOException {
+if (!(fs instanceof DistributedFileSystem))
+ return false;
+DistributedFileSystem dfs = (DistributedFileSystem)
FileSystem.get(CachedConfiguration.getInstance());
+// So this: if (!dfs.setSafeMode(SafeModeAction.SAFEMODE_GET))
+// Becomes this:
+Class? constantClass;
+try
[38/40] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ad9ee5e0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ad9ee5e0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ad9ee5e0 Branch: refs/heads/master Commit: ad9ee5e06aae970516f2fb9b2400c07c45a94a5a Parents: f896c95 6446ad5 Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 10:46:39 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 10:46:39 2013 -0500 -- --
[22/40] git commit: ACCUMULO-564 changes for 0.23 compile compatiblity
ACCUMULO-564 changes for 0.23 compile compatiblity
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1332674
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit a5765d111e67b5f1cd645909285f729b902c9b6a)
Reason: Hadoop2 Compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
This is a partial backport from 1.5 that excludes the wiki-search example
portions but includes
changes to Accumulo.java and DefaultServlet.java
A few minor 1.4.3 specific hacks to get compliation to work against hadoop
2.0.2-alpha
- CoordinateRecoveryTask.java and LogSort.java
Author: Jonathan M Hsieh j...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31e4dd15
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31e4dd15
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31e4dd15
Branch: refs/heads/master
Commit: 31e4dd15f5cb8bc85372dd66849e3452bae3ee7f
Parents: 2c83ca3
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Thu May 30 17:41:58 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../src/main/java/org/apache/accumulo/server/Accumulo.java | 1 -
.../apache/accumulo/server/master/CoordinateRecoveryTask.java | 3 +++
.../main/java/org/apache/accumulo/server/master/LogSort.java | 2 +-
.../accumulo/server/monitor/servlets/DefaultServlet.java | 6 +++---
4 files changed, 7 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
--
diff --git a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
index 32462b7..253962b 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -43,7 +43,6 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
import org.apache.log4j.Logger;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.xml.DOMConfigurator;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
index 79065a2..64ed42e 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
@@ -257,6 +257,9 @@ public class CoordinateRecoveryTask implements Runnable {
return new RecoveryStatus(logFile.server, logFile.file, (sortJob ==
null ? 0. : sortJob.mapProgress()), (sortJob == null ? 0.
: sortJob.reduceProgress()), (int) (System.currentTimeMillis() -
copyStartTime), (sortJob != null) ? 1. : (copySize == 0 ? 0 : copiedSoFar()
/ (double) copySize));
+ } catch (InterruptedException ie) {
+// Hadoop 2.0.2-alpha's Job.mapProgress throws Interrupted Exception.
1.x and 2.0.4 do not.
+return new RecoveryStatus(logFile.server, logFile.file, 1.0, 1.0,
(int) (System.currentTimeMillis() - copyStartTime), 1.0);
} catch (NullPointerException npe) {
return new RecoveryStatus(logFile.server, logFile.file, 1.0, 1.0,
(int) (System.currentTimeMillis() - copyStartTime), 1.0);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31e4dd15/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
b/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
index 1e7f29b..006d06e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
@@ -81,8 +81,8 @@ public class LogSort extends Configured implements Tool {
@Override
public void abortTask(TaskAttemptContext context) {
- super.abortTask(context);
try {
+super.abortTask(context);
outputFileSystem.delete(outputPath, true);
} catch (IOException ex) {
throw
[03/40] ACCUMULO-600 removed wikisearch from trunk
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8db62992/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml -- diff --git a/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml b/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml deleted file mode 100644 index 41d146a..000 --- a/src/examples/wikisearch/query/src/test/resources/enwiki-20110901-001.xml +++ /dev/null @@ -1,153 +0,0 @@ -mediawiki xmlns=http://www.mediawiki.org/xml/export-0.5/; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://www.mediawiki.org/xml/export-0.5/ http://www.mediawiki.org/xml/export-0.5.xsd; version=0.5 xml:lang=en - siteinfo -sitenameWikipedia/sitename -basehttp://en.wikipedia.org/wiki/Main_Page/base -generatorMediaWiki 1.17wmf1/generator -casefirst-letter/case -namespaces - namespace key=-2 case=first-letterMedia/namespace - namespace key=-1 case=first-letterSpecial/namespace - namespace key=0 case=first-letter / - namespace key=1 case=first-letterTalk/namespace - namespace key=2 case=first-letterUser/namespace - namespace key=3 case=first-letterUser talk/namespace - namespace key=4 case=first-letterWikipedia/namespace - namespace key=5 case=first-letterWikipedia talk/namespace - namespace key=6 case=first-letterFile/namespace - namespace key=7 case=first-letterFile talk/namespace - namespace key=8 case=first-letterMediaWiki/namespace - namespace key=9 case=first-letterMediaWiki talk/namespace - namespace key=10 case=first-letterTemplate/namespace - namespace key=11 case=first-letterTemplate talk/namespace - namespace key=12 case=first-letterHelp/namespace - namespace key=13 case=first-letterHelp talk/namespace - namespace key=14 case=first-letterCategory/namespace - namespace key=15 case=first-letterCategory talk/namespace - namespace key=100 case=first-letterPortal/namespace - namespace key=101 case=first-letterPortal talk/namespace - namespace key=108 case=first-letterBook/namespace - namespace key=109 case=first-letterBook talk/namespace -/namespaces - /siteinfo - page -titleAbacus/title -id655/id -revision - id34350/id - timestamp2002-02-25T15:43:11Z/timestamp - contributor -ipConversion script/ip - /contributor - minor / - commentAutomated conversion/comment - text xml:space=preserve1. An '''abacus''' is a counting frame, typically wooden with balls sliding on wires. It was first used before the adoption of the ten-digit [[Arabic numerals | Arabic numeral]] system and is still widely used by small merchants in [[China]]. The Roman abacus contains seven long and seven shorter rods or bars, the former having four perforated beads running on them and the latter one. The bar marked 1 indicates units, X tens, and so on up to millions. The beads on the shorter bars denote fives,--five units, five tens, etc. The rod O and corresponding short rod are for marking ounces; and the short quarter rods for fractions of an ounce. Computations are made with it by means of balls of bone or ivory running on slender bamboo rods, similar to the simpler board, fitted up with beads strung on wires, which has been employed in teaching the rudiments of arithmetic in English schools. - -The '''Suan'''4-'''Pan'''2 (amp;#31639;amp;#30436;) of the Chinese closely resembles the Roman abacus in its construction and use. The Chinese abacus is usally around eight inches tall and it comes in various width depending on application, it usually has more than seven rods. There are two beads on each rod in the upper deck and five beads each in the bottom. The beads are usually round and made of hard wood. The abacus can be reset to the starting position instantly by a quick jerk along the horizontal axis to spin all the beads away from the horizontal beam at the center. The beads are counted by moving them up or down towards the beam. Chinese abacus does more than just counting. Unlike the simple counting board used in elimentary schools, very efficient Suan4-Pan2 techniques were developed to do multiplication, division, addition, substraction, square root and cubic root at high speed. The beads and rods were often lubricated to ensure speed. When all five beads in the lower deck are moved up, they are reset to the original position, and one bead in the top deck is moved down as a carry. When both beads in the upper deck are moved down, they are reset and a bead on the adjacent rod on the left is moved up as a carry. The result of the computation is read off from the beads clustered near the separator beam between the upper and lower deck. In a sense, the abacus works as a 5-2-5-2-5-2... based number system in which carries and shiftings are similiar to
[23/40] git commit: ACCUMULO-769 Fix Hadoop 2.0 breakage by removing methods marked as deprecated that didn't exist in prior version. ACCUMULO-975 Fix proxy pom.xml to support Hadoop 2.0
ACCUMULO-769 Fix Hadoop 2.0 breakage by removing methods marked as deprecated
that didn't exist in prior version. ACCUMULO-975 Fix proxy pom.xml to support
Hadoop 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1435230
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit ec4055c698d7735093e964e30729ede9df71157f)
Reason: Hadoop2 compat
Author: Christopher Tubbs ctubb...@apache.org
Ref: ACCUMULO-1792
This patch differs from upstream by only including the changes relevant to
ACCUMULO-975. It also does not reformat as much of proxy/pom.xml as the
original.
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4c16d8b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4c16d8b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4c16d8b8
Branch: refs/heads/master
Commit: 4c16d8b82713cb888e33a224a57d0d41b156b50b
Parents: 0f97284
Author: Sean Busbey bus...@cloudera.com
Authored: Mon Nov 4 15:39:14 2013 -0600
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
src/proxy/pom.xml | 96 ++
1 file changed, 65 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4c16d8b8/src/proxy/pom.xml
--
diff --git a/src/proxy/pom.xml b/src/proxy/pom.xml
index 5d0414d..e1daa29 100644
--- a/src/proxy/pom.xml
+++ b/src/proxy/pom.xml
@@ -33,22 +33,22 @@
build
pluginManagement
plugins
- plugin
- groupIdorg.apache.maven.plugins/groupId
- artifactIdmaven-jar-plugin/artifactId
- configuration
- archive
- manifestSections
- manifestSection
- nameaccumulo/proxy//name
- manifestEntries
- Sealedtrue/Sealed
- /manifestEntries
- /manifestSection
- /manifestSections
- /archive
- /configuration
- /plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-jar-plugin/artifactId
+ configuration
+archive
+ manifestSections
+manifestSection
+ nameaccumulo/proxy//name
+ manifestEntries
+Sealedtrue/Sealed
+ /manifestEntries
+/manifestSection
+ /manifestSections
+/archive
+ /configuration
+/plugin
/plugins
/pluginManagement
plugins
@@ -72,9 +72,9 @@
/build
dependencies
dependency
-groupIdorg.apache.accumulo/groupId
-artifactIdaccumulo-core/artifactId
-scopecompile/scope
+ groupIdorg.apache.accumulo/groupId
+ artifactIdaccumulo-core/artifactId
+ scopecompile/scope
/dependency
dependency
groupIdorg.apache.accumulo/groupId
@@ -82,11 +82,6 @@
scopecompile/scope
/dependency
dependency
-groupIdorg.apache.hadoop/groupId
-artifactIdhadoop-core/artifactId
-scopecompile/scope
-/dependency
-dependency
groupIdorg.apache.zookeeper/groupId
artifactIdzookeeper/artifactId
scopecompile/scope
@@ -113,16 +108,55 @@
scopecompile/scope
/dependency
dependency
- groupIdorg.apache.accumulo/groupId
- artifactIdexamples-simple/artifactId
- version${project.version}/version
- scopetest/scope
+ groupIdorg.apache.accumulo/groupId
+ artifactIdexamples-simple/artifactId
+ version${project.version}/version
+ scopetest/scope
/dependency
dependency
-groupIdorg.apache.accumulo/groupId
-artifactIdaccumulo-server/artifactId
-version${project.version}/version
+ groupIdorg.apache.accumulo/groupId
+ artifactIdaccumulo-server/artifactId
+ version${project.version}/version
/dependency
/dependencies
+ profiles
+!-- profile for building against Hadoop 1.0.x
+Activate by not specifying hadoop.profile --
+profile
+ idhadoop-1.0/id
+ activation
+property
+ name!hadoop.profile/name
+/property
+ /activation
+ dependencies
+dependency
+ groupIdorg.apache.hadoop/groupId
+ artifactIdhadoop-core/artifactId
+/dependency
+ /dependencies
+/profile
+!-- profile for building against Hadoop 2.0.x
+Activate using: mvn -Dhadoop.profile=2.0 --
+profile
+
[39/40] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.1-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/6c80fa50 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c80fa50 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c80fa50 Branch: refs/heads/master Commit: 6c80fa5038c906ee2f9875c0f3a9c16b9248ecba Parents: f478737 ad9ee5e Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 10:48:03 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 10:48:03 2013 -0500 -- --
[33/40] git commit: ACCUMULO-645 found and removed many other references to HADOOP_HOME
ACCUMULO-645 found and removed many other references to HADOOP_HOME
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1433049
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 15f71f96c6850cbc1712e1693307f8f8f978d069)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d16fd77f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d16fd77f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d16fd77f
Branch: refs/heads/master
Commit: d16fd77fa10afedab3bffe17235a3d700fd8de8e
Parents: d70e5a1
Author: Sean Busbey bus...@cloudera.com
Authored: Sun Oct 27 15:47:25 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
bin/accumulo| 15 +--
bin/config.sh | 6 +++---
.../start/classloader/AccumuloClassLoader.java | 7 ---
test/system/auto/TestUtils.py | 16 ++--
4 files changed, 30 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d16fd77f/bin/accumulo
--
diff --git a/bin/accumulo b/bin/accumulo
index 6642818..bbca3f0 100755
--- a/bin/accumulo
+++ b/bin/accumulo
@@ -48,9 +48,9 @@ if [ -z $JAVA_HOME -o ! -d $JAVA_HOME ]; then
echo JAVA_HOME is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
exit 1
fi
-if [ -z $HADOOP_HOME -o ! -d $HADOOP_HOME ]; then
-echo HADOOP_HOME is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
-exit 1
+if [ -z $HADOOP_PREFIX -o ! -d $HADOOP_PREFIX ]; then
+ echo HADOOP_PREFIX is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
+ exit 1
fi
if [ -z $ZOOKEEPER_HOME -o ! -d $ZOOKEEPER_HOME ]; then
echo ZOOKEEPER_HOME is not set. Please make sure it's set globally or in
conf/accumulo-env.sh
@@ -60,8 +60,11 @@ fi
#Export the variables just in case they are not exported
#This makes them available to java
export JAVA_HOME=$JAVA_HOME
-export HADOOP_HOME=$HADOOP_HOME
+export HADOOP_PREFIX=$HADOOP_PREFIX
export ZOOKEEPER_HOME=$ZOOKEEPER_HOME
+# backwards compatible with old configurations
+export HADOOP_HOME=$HADOOP_PREFIX
+export HADOOP_HOME_WARN_SUPPRESS=1
START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar
COMMONS_JCI_JARS=$ACCUMULO_HOME/lib/commons-jci-core-1.0.jar:$ACCUMULO_HOME/lib/commons-jci-fam-1.0.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar:$ACCUMULO_HOME/lib/commons-logging-1.0.4.jar:$ACCUMULO_HOME/lib/commons-logging-api-1.0.4.jar
@@ -79,7 +82,7 @@ locationByProgram()
}
test -n $JAVA_HOME || export JAVA_HOME=`locationByProgram java`
-test -n $HADOOP_HOME|| export HADOOP_HOME=`locationByProgram hadoop`
+test -n $HADOOP_PREFIX || export HADOOP_PREFIX=`locationByProgram hadoop`
test -n $ZOOKEEPER_HOME || export ZOOKEEPER_HOME=`locationByProgram zkCli.sh`
@@ -130,4 +133,4 @@ JAVA=$JAVA_HOME/bin/java
PLATFORM=`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`
# app isn't used anywhere, but it makes the process easier to spot when
ps/top/snmp truncate the command line
-exec $JAVA -Dapp=$1 -classpath $CLASSPATH $ACCUMULO_OPTS
-XX:OnOutOfMemoryError=${ACCUMULO_KILL_CMD:-kill -9 %p}
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
-Djava.library.path=$HADOOP_HOME/lib/native/$PLATFORM
-Dorg.apache.accumulo.core.home.dir=$ACCUMULO_HOME
-Dhadoop.home.dir=$HADOOP_HOME -Dzookeeper.home.dir=$ZOOKEEPER_HOME
org.apache.accumulo.start.Main $@
+exec $JAVA -Dapp=$1 -classpath $CLASSPATH $ACCUMULO_OPTS
-XX:OnOutOfMemoryError=${ACCUMULO_KILL_CMD:-kill -9 %p}
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
-Djava.library.path=$HADOOP_PREFIX/lib/native/$PLATFORM
-Dorg.apache.accumulo.core.home.dir=$ACCUMULO_HOME
-Dhadoop.home.dir=$HADOOP_PREFIX -Dhadoop.conf.dir=$HADOOP_CONF_DIR
-Dzookeeper.home.dir=$ZOOKEEPER_HOME org.apache.accumulo.start.Main $@
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d16fd77f/bin/config.sh
--
diff --git a/bin/config.sh b/bin/config.sh
index d9300d5..08a8bbd 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -74,14 +74,14 @@ fi
if [ -z $HADOOP_PREFIX ]
then
- HADOOP_HOME=`which hadoop`
+ HADOOP_PREFIX=`which hadoop`
if [ -z $HADOOP_PREFIX ]
then
echo You must set HADOOP_PREFIX
exit 1
fi
- HADOOP_HOME=`dirname $HADOOP_PREFIX`
-
[16/40] git commit: ACCUMULO-804 initial attempt to make accumulo binary compatible with 2.0
ACCUMULO-804 initial attempt to make accumulo binary compatible with 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1483399
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit d6c612d087e7f922c9935888cf443d4a9f1999c2)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2c83ca33
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2c83ca33
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2c83ca33
Branch: refs/heads/master
Commit: 2c83ca337ac54e3c71aff1596bcf6ea04aea6491
Parents: 1b1334f
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Wed May 29 14:23:01 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../accumulo/core/util/TTimeoutTransport.java | 12 -
.../org/apache/accumulo/server/Accumulo.java| 51 ++--
2 files changed, 58 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c83ca33/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
index 3c1fa6a..0aebc39 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
@@ -21,6 +21,7 @@ import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.lang.reflect.Method;
import java.net.Socket;
import java.net.SocketAddress;
import java.nio.channels.spi.SelectorProvider;
@@ -31,12 +32,21 @@ import org.apache.thrift.transport.TTransport;
public class TTimeoutTransport {
+ private static InputStream getInputStream(Socket socket, long timeout) {
+try {
+ Method m = NetUtils.class.getMethod(getInputStream, Socket.class,
Long.TYPE);
+ return (InputStream)m.invoke(null, socket, timeout);
+} catch (Exception e) {
+ throw new RuntimeException(e);
+}
+ }
+
public static TTransport create(SocketAddress addr, long timeoutMillis)
throws IOException {
Socket socket = SelectorProvider.provider().openSocketChannel().socket();
socket.setSoLinger(false, 0);
socket.setTcpNoDelay(true);
socket.connect(addr);
-InputStream input = new
BufferedInputStream(NetUtils.getInputStream(socket, timeoutMillis), 1024 * 10);
+InputStream input = new BufferedInputStream(getInputStream(socket,
timeoutMillis), 1024 * 10);
OutputStream output = new
BufferedOutputStream(NetUtils.getOutputStream(socket, timeoutMillis), 1024 *
10);
return new TIOStreamTransport(input, output);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c83ca33/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
--
diff --git a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
index b2feb5c..32462b7 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/Accumulo.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Map.Entry;
@@ -212,10 +213,7 @@ public class Accumulo {
while (true) {
try {
FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
-if (!(fs instanceof DistributedFileSystem))
- break;
-DistributedFileSystem dfs = (DistributedFileSystem)
FileSystem.get(CachedConfiguration.getInstance());
-if (!dfs.setSafeMode(SafeModeAction.SAFEMODE_GET))
+if (!isInSafeMode(fs))
break;
log.warn(Waiting for the NameNode to leave safemode);
} catch (IOException ex) {
@@ -227,4 +225,49 @@ public class Accumulo {
}
log.info(Connected to HDFS);
}
+
+ private static boolean isInSafeMode(FileSystem fs) throws IOException {
+if (!(fs instanceof DistributedFileSystem))
+ return false;
+DistributedFileSystem dfs = (DistributedFileSystem)
FileSystem.get(CachedConfiguration.getInstance());
+// So this: if (!dfs.setSafeMode(SafeModeAction.SAFEMODE_GET))
+// Becomes this:
+Class? constantClass;
+try {
+
[40/40] 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/abc3d699 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/abc3d699 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/abc3d699 Branch: refs/heads/master Commit: abc3d6993e8e39fcd8019ad7593b7080a5903823 Parents: 77a4f5a 6c80fa5 Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 10:50:02 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 10:50:02 2013 -0500 -- --
[34/40] git commit: ACCUMULO-645 found another HADOOP_HOME reference
ACCUMULO-645 found another HADOOP_HOME reference
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1433058
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit e7f6e5ff4f80d1f2bfe3f6daf0889d51b5593c6a)
Reason: Hadoop2 Compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5dd9016a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5dd9016a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5dd9016a
Branch: refs/heads/master
Commit: 5dd9016a1d406618531725e6ce111b59acae72ec
Parents: d16fd77
Author: Eric C. Newton e...@apache.org
Authored: Mon Jan 14 19:11:44 2013 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
.../org/apache/accumulo/start/classloader/AccumuloClassLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5dd9016a/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
--
diff --git
a/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
b/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index fd41938..ff02d13 100644
---
a/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++
b/src/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -111,7 +111,7 @@ public class AccumuloClassLoader {
+ $ACCUMULO_HOME/lib/[^.].*.jar,\n
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n
+ $HADOOP_PREFIX/[^.].*.jar,\n + $HADOOP_CONF_DIR,\n
- + $HADOOP_HOME/lib/[^.].*.jar,\n;
+ + $HADOOP_PREFIX/lib/[^.].*.jar,\n;
/**
* Dynamic classpath. These locations will be monitored for changes.
[37/40] git commit: ACCUMULO-645 found another HADOOP_HOME reference
ACCUMULO-645 found another HADOOP_HOME reference git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1433102 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 16c9a002e2d2c1556d8f836217042ebcf008da5a) Reason: Hadoop2 Compat Author: Eric C. Newton e...@apache.org Ref: ACCUMULO-1792 Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3a350960 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3a350960 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3a350960 Branch: refs/heads/master Commit: 3a3509604a71a549c4b1f07d1411b3e25bf3f7bf Parents: 5dd9016 Author: Eric C. Newton e...@apache.org Authored: Mon Jan 14 20:26:20 2013 + Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- conf/examples/1GB/native-standalone/accumulo-site.xml | 6 +++--- conf/examples/1GB/standalone/accumulo-site.xml | 6 +++--- conf/examples/2GB/native-standalone/accumulo-site.xml | 6 +++--- conf/examples/2GB/standalone/accumulo-site.xml | 6 +++--- conf/examples/3GB/native-standalone/accumulo-site.xml | 6 +++--- conf/examples/3GB/standalone/accumulo-site.xml | 6 +++--- conf/examples/512MB/native-standalone/accumulo-site.xml | 6 +++--- conf/examples/512MB/standalone/accumulo-site.xml| 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/1GB/native-standalone/accumulo-site.xml -- diff --git a/conf/examples/1GB/native-standalone/accumulo-site.xml b/conf/examples/1GB/native-standalone/accumulo-site.xml index 3f4705d..97f70d5 100644 --- a/conf/examples/1GB/native-standalone/accumulo-site.xml +++ b/conf/examples/1GB/native-standalone/accumulo-site.xml @@ -102,9 +102,9 @@ $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, $ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar, - $HADOOP_HOME/conf, - $HADOOP_HOME/[^.].*.jar, - $HADOOP_HOME/lib/[^.].*.jar, + $HADOOP_CONF_DIR, + $HADOOP_PREFIX/[^.].*.jar, + $HADOOP_PREFIX/lib/[^.].*.jar, /value descriptionClasspaths that accumulo checks for updates and class files. When using the Security Manager, please remove the .../target/classes/ values. http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/1GB/standalone/accumulo-site.xml -- diff --git a/conf/examples/1GB/standalone/accumulo-site.xml b/conf/examples/1GB/standalone/accumulo-site.xml index 5c45e21..f857fd0 100644 --- a/conf/examples/1GB/standalone/accumulo-site.xml +++ b/conf/examples/1GB/standalone/accumulo-site.xml @@ -97,9 +97,9 @@ $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, $ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar, - $HADOOP_HOME/conf, - $HADOOP_HOME/[^.].*.jar, - $HADOOP_HOME/lib/[^.].*.jar, + $HADOOP_CONF_DIR, + $HADOOP_PREFIX/[^.].*.jar, + $HADOOP_PREFIX/lib/[^.].*.jar, /value descriptionClasspaths that accumulo checks for updates and class files. When using the Security Manager, please remove the .../target/classes/ values. http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/2GB/native-standalone/accumulo-site.xml -- diff --git a/conf/examples/2GB/native-standalone/accumulo-site.xml b/conf/examples/2GB/native-standalone/accumulo-site.xml index f39b367..3988e66 100644 --- a/conf/examples/2GB/native-standalone/accumulo-site.xml +++ b/conf/examples/2GB/native-standalone/accumulo-site.xml @@ -92,9 +92,9 @@ $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, $ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar, - $HADOOP_HOME/conf, - $HADOOP_HOME/[^.].*.jar, - $HADOOP_HOME/lib/[^.].*.jar, + $HADOOP_CONF_DIR, + $HADOOP_PREFIX/[^.].*.jar, + $HADOOP_PREFIX/lib/[^.].*.jar, /value descriptionClasspaths that accumulo checks for updates and class files. When using the Security Manager, please remove the .../target/classes/ values. http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a350960/conf/examples/2GB/standalone/accumulo-site.xml -- diff --git a/conf/examples/2GB/standalone/accumulo-site.xml b/conf/examples/2GB/standalone/accumulo-site.xml index 653860b..9f5d7fd 100644 --- a/conf/examples/2GB/standalone/accumulo-site.xml +++
[19/40] git commit: ACCUMULO-286 added context factory stuff
ACCUMULO-286 added context factory stuff
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1328104
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 0680b04bf03e2d6ad19ae3c368f6cb23f4e30056)
Reason: Testing
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7fa0085a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7fa0085a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7fa0085a
Branch: refs/heads/master
Commit: 7fa0085a48248e0fcb06ee38064f712026ed9609
Parents: 6bba940
Author: Billie Rinaldi bil...@apache.org
Authored: Thu Apr 19 20:22:16 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../accumulo/core/util/ContextFactory.java | 12 +++---
.../helloworld/InsertWithOutputFormat.java | 4 ++--
.../simple/filedata/ChunkInputFormatTest.java | 6 ++---
.../wikisearch/ingest/WikipediaMapperTest.java | 9 +++-
.../reader/AggregatingRecordReaderTest.java | 24 +++-
.../wikisearch/logic/TestQueryLogic.java| 9
6 files changed, 34 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7fa0085a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
index 61e853d..5a1c2ef 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
@@ -147,15 +147,21 @@ public class ContextFactory {
}
}
- @SuppressWarnings({unchecked, rawtypes})
public static K1,V1,K2,V2 MapperK1,V1,K2,V2.Context
createMapContext(MapperK1,V1,K2,V2 m, TaskAttemptContext tac,
RecordReaderK1,V1 reader,
RecordWriterK2,V2 writer, InputSplit split) {
+return createMapContext(m, tac, reader, writer, null, null, split);
+ }
+
+ @SuppressWarnings({unchecked, rawtypes})
+ public static K1,V1,K2,V2 MapperK1,V1,K2,V2.Context
createMapContext(MapperK1,V1,K2,V2 m, TaskAttemptContext tac,
RecordReaderK1,V1 reader,
+ RecordWriterK2,V2 writer, OutputCommitter committer, StatusReporter
reporter, InputSplit split) {
try {
if (useV21) {
-Object basis =
MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, null, null, split);
+Object basis =
MAP_CONTEXT_IMPL_CONSTRUCTOR.newInstance(tac.getConfiguration(),
tac.getTaskAttemptID(), reader, writer, committer, reporter, split);
return (Mapper.Context)
MAP_CONTEXT_CONSTRUCTOR.newInstance((MapperK1,V1,K2,V2)
MAP_CONSTRUCTOR.newInstance(), basis);
} else {
-return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m,
tac.getConfiguration(), tac.getTaskAttemptID(), reader, writer, null, null,
split);
+return (Mapper.Context) MAP_CONTEXT_CONSTRUCTOR.newInstance(m,
tac.getConfiguration(), tac.getTaskAttemptID(), reader, writer, committer,
reporter,
+split);
}
} catch (InstantiationException e) {
throw new IllegalArgumentException(Can't create object, e);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7fa0085a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
--
diff --git
a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
b/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
index af03470..5c37d6c 100644
---
a/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
+++
b/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
@@ -45,8 +45,8 @@ public class InsertWithOutputFormat extends Configured
implements Tool {
}
Text tableName = new Text(args[4]);
Job job = new Job(getConf());
-AccumuloOutputFormat.setZooKeeperInstance(job, args[0], args[1]);
-AccumuloOutputFormat.setOutputInfo(job, args[3], args[4].getBytes(), true,
null);
+AccumuloOutputFormat.setZooKeeperInstance(job.getConfiguration(), args[0],
args[1]);
+AccumuloOutputFormat.setOutputInfo(job.getConfiguration(), args[2],
args[3].getBytes(), true, null);
job.setOutputFormatClass(AccumuloOutputFormat.class);
//
[31/40] git commit: ACCUMULO-645 switch to using HADOOP_PREFIX and HADOOP_CONF_DIR
ACCUMULO-645 switch to using HADOOP_PREFIX and HADOOP_CONF_DIR
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1431051
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit b8fdefd91927f82809dfdc4004569f2e223ebdeb)
Reason: Hadoop2 compat
Author: Eric C. Newton e...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/344e7254
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/344e7254
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/344e7254
Branch: refs/heads/master
Commit: 344e725426e76b952d0f390d65ef6062c35fdc03
Parents: 651033a
Author: Eric C. Newton e...@apache.org
Authored: Wed Jan 9 20:43:35 2013 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
bin/config.sh | 16
conf/examples/1GB/native-standalone/accumulo-env.sh | 10 +-
conf/examples/1GB/standalone/accumulo-env.sh| 10 +-
conf/examples/2GB/native-standalone/accumulo-env.sh | 9 -
conf/examples/2GB/standalone/accumulo-env.sh| 10 +-
conf/examples/3GB/native-standalone/accumulo-env.sh | 9 -
conf/examples/3GB/standalone/accumulo-env.sh| 9 -
.../512MB/native-standalone/accumulo-env.sh | 9 -
conf/examples/512MB/standalone/accumulo-env.sh | 9 -
9 files changed, 75 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/344e7254/bin/config.sh
--
diff --git a/bin/config.sh b/bin/config.sh
index 5836b46..d9300d5 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -72,23 +72,23 @@ if [ -z ${ACCUMULO_VERSION} ]; then
ACCUMULO_VERSION=1.4.5-SNAPSHOT
fi
-if [ -z $HADOOP_HOME ]
+if [ -z $HADOOP_PREFIX ]
then
HADOOP_HOME=`which hadoop`
- if [ -z $HADOOP_HOME ]
+ if [ -z $HADOOP_PREFIX ]
then
- echo You must set HADOOP_HOME
+ echo You must set HADOOP_PREFIX
exit 1
fi
- HADOOP_HOME=`dirname $HADOOP_HOME`
- HADOOP_HOME=`dirname $HADOOP_HOME`
+ HADOOP_HOME=`dirname $HADOOP_PREFIX`
+ HADOOP_HOME=`dirname $HADOOP_PREFIX`
fi
-if [ ! -d $HADOOP_HOME ]
+if [ ! -d $HADOOP_PREFIX ]
then
-echo $HADOOP_HOME is not a directory
+echo $HADOOP_PREFIX is not a directory
exit 1
fi
-export HADOOP_HOME
+export HADOOP_PREFIX
if [ ! -f $ACCUMULO_CONF_DIR/masters -o ! -f $ACCUMULO_CONF_DIR/slaves ]
then
http://git-wip-us.apache.org/repos/asf/accumulo/blob/344e7254/conf/examples/1GB/native-standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh
b/conf/examples/1GB/native-standalone/accumulo-env.sh
index 4033152..15caef6 100755
--- a/conf/examples/1GB/native-standalone/accumulo-env.sh
+++ b/conf/examples/1GB/native-standalone/accumulo-env.sh
@@ -27,9 +27,17 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z $HADOOP_HOME ]
+then
+ test -z $HADOOP_PREFIX export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX=$HADOOP_HOME
+ unset HADOOP_HOME
+fi
+test -z $HADOOP_CONF_DIRexport
HADOOP_CONF_DIR=$HADOOP_PREFIX/conf
+
test -z $JAVA_HOME export JAVA_HOME=/path/to/java
-test -z $HADOOP_HOMEexport HADOOP_HOME=/path/to/hadoop
test -z $ZOOKEEPER_HOME export ZOOKEEPER_HOME=/path/to/zookeeper
test -z $ACCUMULO_LOG_DIR export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
if [ -f ${ACCUMULO_CONF_DIR}/accumulo.policy ]
http://git-wip-us.apache.org/repos/asf/accumulo/blob/344e7254/conf/examples/1GB/standalone/accumulo-env.sh
--
diff --git a/conf/examples/1GB/standalone/accumulo-env.sh
b/conf/examples/1GB/standalone/accumulo-env.sh
index 4d09467..5c54a39 100755
--- a/conf/examples/1GB/standalone/accumulo-env.sh
+++ b/conf/examples/1GB/standalone/accumulo-env.sh
@@ -27,9 +27,17 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z $HADOOP_HOME ]
+then
+ test -z $HADOOP_PREFIX export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX=$HADOOP_HOME
+ unset HADOOP_HOME
+fi
+test -z $HADOOP_CONF_DIRexport
HADOOP_CONF_DIR=$HADOOP_PREFIX/conf
+
test -z $JAVA_HOME export JAVA_HOME=/path/to/java
-test -z $HADOOP_HOMEexport HADOOP_HOME=/path/to/hadoop
test -z $ZOOKEEPER_HOME export ZOOKEEPER_HOME=/path/to/zookeeper
test -z $ACCUMULO_LOG_DIR export
[02/40] git commit: ACCUMULO-1520 misc functional test fixes
ACCUMULO-1520 misc functional test fixes
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1494361
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 9ac99ea8b402792b36c494c02ac3103e7a061e2a)
Reason: Test
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Hadoop2 by default emits extra logging information to stdout which causes
accumulo's ListTables to emit
extra data to stdout. This filters out these invalid lines ListTables.
Author: Jon Hsieh jmhs...@apache.org
Included the presplit multiplier portion because the LongRowTest has been
failing for me regularly on VMs on 1.4.5-SNAPSHOT and this change makes 1.4.x
consistent with the other active development branches.
Included the search example change for consistency since the rest of hte patch
was applicable.
Author: Sean Busbey bus...@clouderagovt.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aff0d641
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aff0d641
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aff0d641
Branch: refs/heads/master
Commit: aff0d641274d78a5682defbd5e6d0717aac68546
Parents: 1fe5f7f
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Mon Jun 24 00:36:19 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:41 2013 -0500
--
.../apache/accumulo/server/test/functional/LargeRowTest.java | 2 +-
test/system/auto/TestUtils.py | 5 +
test/system/auto/simple/examples.py| 6 +++---
3 files changed, 9 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
b/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
index bc02929..df98f6e 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
@@ -95,7 +95,7 @@ public class LargeRowTest extends FunctionalTest {
UtilWaitThread.sleep(1);
-checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS);
+checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS * 4);
verify(REG_TABLE_NAME);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index b70677a..b7659a2 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -458,6 +458,11 @@ class TestUtilsMixin:
out,err = handle.communicate()
self.assert_(handle.returncode==0)
for line in out.split('\n') :
+
+# filter out unwanted extra hadoop2 logging
+if line.find(=) 0:
+ continue
+
left, right = line.split(=)
left = left.strip()
right = right.strip()
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aff0d641/test/system/auto/simple/examples.py
--
diff --git a/test/system/auto/simple/examples.py
b/test/system/auto/simple/examples.py
index b22411a..bed321f 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -80,14 +80,14 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'dataTable',
visibility,
10,
- ACCUMULO_HOME+/src)
+ ACCUMULO_HOME+/test)
self.comment( searching for a file)
handle = self.runOn('localhost', [self.accumulo_sh(),
'org.apache.accumulo.examples.simple.dirlist.QueryUtil',
INSTANCE_NAME, ZOOKEEPERS, ROOT,
ROOT_PASSWORD,
- 'indexTable', auths, 'Fate.java',
'-search'])
+ 'indexTable', auths, 'examples.py',
'-search'])
out, err = handle.communicate()
self.assert_(handle.returncode == 0)
-self.assert_(out.find('accumulo/server/fate/Fate.java') = 0)
+self.assert_(out.find('test/system/auto/simple/examples.py') = 0)
self.comment( found file at + out)
[12/40] ACCUMULO-600 removed wikisearch from trunk
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8db62992/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
--
diff --git
a/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
b/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
deleted file mode 100644
index c842da7..000
---
a/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/reader/AggregatingRecordReaderTest.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * 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.examples.wikisearch.reader;
-
-import static org.junit.Assert.assertEquals;
-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.FileWriter;
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.accumulo.core.util.ContextFactory;
-import
org.apache.accumulo.examples.wikisearch.ingest.WikipediaInputFormat.WikipediaInputSplit;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.lib.input.FileSplit;
-import org.junit.Before;
-import org.junit.Test;
-import org.w3c.dom.Document;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public class AggregatingRecordReaderTest {
-
- public static class MyErrorHandler implements ErrorHandler {
-
-@Override
-public void error(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
-@Override
-public void fatalError(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
-@Override
-public void warning(SAXParseException exception) throws SAXException {
- // System.out.println(exception.getMessage());
-}
-
- }
-
- private static final String xml1 = ?xml version=\1.0\
encoding=\UTF-8\? + doc\n + aA/a\n + bB/b\n + /doc\n
- + ?xml version=\1.0\ encoding=\UTF-8\? + doc\n +
aC/a\n + bD/b\n + /doc\n + ?xml version=\1.0\
encoding=\UTF-8\?
- + doc\n + aE/a\n + bF/b\n + /doc\n;
-
- private static final String xml2 = bB/b\n + /doc\n + doc\n +
aC/a\n + bD/b\n + /doc\n + doc\n + aE/a\n
- + bF/b\n + /doc\n;
-
- private static final String xml3 = doc\n + aA/a\n +
bB/b\n + /doc\n + doc\n + aC/a\n + bD/b\n +
/doc\n
- + doc\n + aE/a\n;
-
- private static final String xml4 = doc + aA/a + bB/b +
/doc + doc + aC/a + bD/b + /doc + doc
- + aE/a + bF/b + /doc;
-
- private static final String xml5 = doc attr=\G\ + aA/a +
bB/b + /doc + doc + aC/a + bD/b + /doc
- + doc attr=\H\/ + doc + aE/a + bF/b + /doc
+ doc attr=\I\/;
-
- private Configuration conf = null;
- private TaskAttemptContext ctx = null;
- private static DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
- private XPathFactory xpFactory = XPathFactory.newInstance();
- private XPathExpression EXPR_A = null;
- private XPathExpression EXPR_B = null;
- private XPathExpression EXPR_ATTR = null;
-
- @Before
- public void setUp() throws Exception {
-conf = new Configuration();
-conf.set(AggregatingRecordReader.START_TOKEN, doc);
-conf.set(AggregatingRecordReader.END_TOKEN, /doc);
-conf.set(AggregatingRecordReader.RETURN_PARTIAL_MATCHES,
Boolean.toString(true));
-ctx = ContextFactory.createTaskAttemptContext(conf);
-XPath xp = xpFactory.newXPath();
-EXPR_A = xp.compile(/doc/a);
-EXPR_B =
[18/40] git commit: ACCUMULO-804 applied fixes to changes that broke compilation against hadoop 2.0
ACCUMULO-804 applied fixes to changes that broke compilation against hadoop 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1431056
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 42cca8a3c910ec4d813b7611b2e65e70e57c6d66)
Reason: Hadoop2 compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec2aaa6a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec2aaa6a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ec2aaa6a
Branch: refs/heads/master
Commit: ec2aaa6aff59fa65593641bf03b719a3147f3791
Parents: fc3fdf3
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Wed May 29 13:16:18 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../test/java/org/apache/accumulo/core/conf/PropertyTest.java | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec2aaa6a/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
--
diff --git
a/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
b/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
index f929921..551d042 100644
--- a/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
+++ b/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
@@ -92,5 +92,11 @@ public class PropertyTest {
typeCheckValidFormat(PropertyType.HOSTLIST, localhost,
server1,server2,server3, server1:,server2:, localhost:,
server2:,
www.server, www.server:, www.server.com,
www.server.com:111);
typeCheckInvalidFormat(PropertyType.HOSTLIST, :111, local host);
+
+typeCheckValidFormat(PropertyType.ABSOLUTEPATH, /foo, /foo/c, /);
+// in hadoop 2.0 Path only normalizes Windows paths properly when run on a
Windows system
+// this makes the following checks fail
+// typeCheckValidFormat(PropertyType.ABSOLUTEPATH, d:\\foo12,
c:\\foo\\g, c:\\foo\\c, c:\\);
+typeCheckInvalidFormat(PropertyType.ABSOLUTEPATH, foo12, foo/g,
foo\\c);
}
}
[20/40] git commit: ACCUMULO-873 removed hdfs info from accumulo monitor page
ACCUMULO-873 removed hdfs info from accumulo monitor page
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1427887
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit e05ca37e5f89b620c990723b2a41396415fdb8b9)
Reason: Polish
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d22af49
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d22af49
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d22af49
Branch: refs/heads/master
Commit: 5d22af4903f49682db98f39d46509f089aeebe86
Parents: 4c16d8b
Author: Billie Rinaldi bil...@apache.org
Authored: Wed Jan 2 18:07:53 2013 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../server/monitor/servlets/DefaultServlet.java | 40
1 file changed, 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d22af49/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
b/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
index 9591d4a..5603f69 100644
---
a/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
+++
b/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
@@ -50,10 +50,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.ContentSummary;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
-import org.apache.hadoop.hdfs.protocol.FSConstants;
-import org.apache.hadoop.ipc.RemoteException;
public class DefaultServlet extends BasicServlet {
@@ -213,10 +209,6 @@ public class DefaultServlet extends BasicServlet {
sb.append(/td\n);
sb.append(td class='noborder'\n);
-doHdfsTable(sb);
-sb.append(/td\n);
-
-sb.append(td class='noborder'\n);
doZooKeeperTable(sb);
sb.append(/td\n);
@@ -296,38 +288,6 @@ public class DefaultServlet extends BasicServlet {
sb.append(/table\n);
}
- private void doHdfsTable(StringBuilder sb) throws IOException {
-// HDFS
-Configuration conf = CachedConfiguration.getInstance();
-DistributedFileSystem fs = (DistributedFileSystem) FileSystem.get(conf);
-String httpAddress = conf.get(dfs.http.address);
-String port = httpAddress.split(:)[1];
-String href = http://; + fs.getUri().getHost() + : + port;
-String liveUrl = href + /dfsnodelist.jsp?whatNodes=LIVE;
-String deadUrl = href + /dfsnodelist.jsp?whatNodes=DEAD;
-sb.append(table\n);
-sb.append(trth colspan='2'a href=' + href +
'NameNode/a/th/tr\n);
-try {
- boolean highlight = false;
- tableRow(sb, (highlight = !highlight), Unreplicatednbsp;Capacity,
bytes(fs.getRawCapacity()));
- tableRow(sb, (highlight = !highlight), %nbsp;Used,
NumberType.commas(fs.getRawUsed() * 100. / fs.getRawCapacity(), 0, 90, 0, 100)
+ %);
- tableRow(sb, (highlight = !highlight), Corruptnbsp;Blocks,
NumberType.commas(fs.getCorruptBlocksCount(), 0, 0));
- DatanodeInfo[] liveNodes =
fs.getClient().datanodeReport(FSConstants.DatanodeReportType.LIVE);
- DatanodeInfo[] deadNodes =
fs.getClient().datanodeReport(FSConstants.DatanodeReportType.DEAD);
- tableRow(sb, (highlight = !highlight), a href=' + liveUrl +
'Livenbsp;Datanbsp;Nodes/a, NumberType.commas(liveNodes.length));
- tableRow(sb, (highlight = !highlight), a href=' + deadUrl +
'Deadnbsp;Datanbsp;Nodes/a, NumberType.commas(deadNodes.length));
- long count = 0;
- for (DatanodeInfo stat : liveNodes)
-count += stat.getXceiverCount();
- tableRow(sb, (highlight = !highlight), Xceivers,
NumberType.commas(count));
-} catch (RemoteException ex) {
- sb.append(trtd colspan='2'Permissionnbsp;Denied/td/tr\n);
-} catch (Exception ex) {
- sb.append(trtd colspan='2'span
class='error'Down/span/td/tr\n);
-}
-sb.append(/table\n);
- }
-
private void doZooKeeperTable(StringBuilder sb) throws IOException {
// Zookeepers
sb.append(table\n);
[01/40] git commit: ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility
Updated Branches:
refs/heads/master 77a4f5a49 - abc3d6993
ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1398373
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit ca1494d1508a3b1404ae9989d4211b00aa3ce307)
Reason: Hadoop2 compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc3fdf33
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fc3fdf33
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fc3fdf33
Branch: refs/heads/master
Commit: fc3fdf33716aa7105e1792c81dfb452fbf8c7944
Parents: aff0d64
Author: Billie Rinaldi bil...@apache.org
Authored: Mon Oct 15 16:32:24 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:41 2013 -0500
--
.../java/org/apache/accumulo/core/util/TTimeoutTransport.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fc3fdf33/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
index 6f74451..3c1fa6a 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
@@ -25,8 +25,7 @@ import java.net.Socket;
import java.net.SocketAddress;
import java.nio.channels.spi.SelectorProvider;
-import org.apache.hadoop.net.SocketInputStream;
-import org.apache.hadoop.net.SocketOutputStream;
+import org.apache.hadoop.net.NetUtils;
import org.apache.thrift.transport.TIOStreamTransport;
import org.apache.thrift.transport.TTransport;
@@ -37,8 +36,8 @@ public class TTimeoutTransport {
socket.setSoLinger(false, 0);
socket.setTcpNoDelay(true);
socket.connect(addr);
-InputStream input = new BufferedInputStream(new SocketInputStream(socket,
timeoutMillis), 1024 * 10);
-OutputStream output = new BufferedOutputStream(new
SocketOutputStream(socket, timeoutMillis), 1024 * 10);
+InputStream input = new
BufferedInputStream(NetUtils.getInputStream(socket, timeoutMillis), 1024 * 10);
+OutputStream output = new
BufferedOutputStream(NetUtils.getOutputStream(socket, timeoutMillis), 1024 *
10);
return new TIOStreamTransport(input, output);
}
}
[29/40] git commit: ACCUMULO-1876 Add default values for hadoop.version and httpclient.version to make ivy work.
ACCUMULO-1876 Add default values for hadoop.version and httpclient.version to make ivy work. (cherry picked from commit 20cbf248e27069c0c05a595342de73e9ecc43743) Differs from original by changing Hadoop version to match current pom and leaving out dependencies not yet declared in profiles. Reason: bugfix Author: Josh Elser els...@apache.org Ref: ACCUMULO-1792 Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6446ad5c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6446ad5c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6446ad5c Branch: refs/heads/master Commit: 6446ad5c20fec4b4506a01ac259c26d08974faf4 Parents: c093974 Author: Josh Elser els...@apache.org Authored: Fri Nov 15 16:39:11 2013 -0600 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6446ad5c/pom.xml -- diff --git a/pom.xml b/pom.xml index eda8390..d664a5b 100644 --- a/pom.xml +++ b/pom.xml @@ -869,6 +869,8 @@ properties targetJdk1.6/targetJdk !-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -- +hadoop.version1.0.4/hadoop.version +!-- overwritten in profiles hadoop-1.0 or hadoop-2.0 -- slf4j.version1.4.3/slf4j.version zookeeper.version3.3.1/zookeeper.version /properties
[21/40] git commit: ACCUMULO-876 added maven profiles to assist in compiling against different versions of hadoop
ACCUMULO-876 added maven profiles to assist in compiling against different
versions of hadoop
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1419924
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 65c271c2a46b87eb0e4991d7fd7b6fbd7456c0a8)
Reason: Hadoop2 Compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
This patch differs from upstream by fixing poms not in the accumulo 1.5 release
and keeping the 1.4 specific build instructions in the README.
Author: Jonathan Hsieh j...@cloudera.com
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f97284d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f97284d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f97284d
Branch: refs/heads/master
Commit: 0f97284da4c1b33ef1b423003d490e2f81a8
Parents: 31e4dd1
Author: Billie Rinaldi bil...@apache.org
Authored: Tue Dec 11 00:01:39 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
README | 8 +-
pom.xml | 78 +---
src/core/pom.xml| 56 --
src/examples/simple/pom.xml | 50 +++--
src/examples/wikisearch/ingest/pom.xml | 42 +--
src/examples/wikisearch/query/pom.xml | 43 +--
src/minicluster/pom.xml | 41 --
src/proxy/pom.xml | 2 +-
src/server/pom.xml | 50 -
.../server/monitor/servlets/DefaultServlet.java | 64 ++--
src/start/pom.xml | 38 +-
src/trace/pom.xml | 2 +-
12 files changed, 385 insertions(+), 89 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f97284d/README
--
diff --git a/README b/README
index ebe89e4..674769d 100644
--- a/README
+++ b/README
@@ -17,7 +17,13 @@ However, if you only have source code, or you wish to make
changes, you need to
have maven configured to get Accumulo prerequisites from repositories. See
the pom.xml file for the necessary components.
-Run mvn package mvn assembly:single -N
+Run mvn package mvn assembly:single -N. By default,
+Accumulo compiles against Hadoop 1.0.4. To compile against a different version
+that is compatible with Hadoop 1.0, specify hadoop.version on the command line,
+e.g. -Dhadoop.version=0.20.205.0 or -Dhadoop.version=1.1.0. To compile
+against Hadoop 2.0, specify -Dhadoop.profile=2.0. By default this uses
+2.0.2-alpha. To compile against a different 2.0-compatible version, specify
+the profile and version, e.g. -Dhadoop.profile=2.0 -Dhadoop.version=0.23.5.
If you are running on another Unix-like operating system (OSX, etc) then
you may wish to build the native libraries. They are not strictly necessary
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f97284d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9ed2fdf..e4c06fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -640,6 +640,62 @@
/plugins
/build
/profile
+!-- profile for building against Hadoop 1.0.x
+Activate by not specifying hadoop.profile --
+profile
+ idhadoop-1.0/id
+ activation
+property
+ name!hadoop.profile/name
+/property
+ /activation
+ properties
+hadoop.version1.0.4/hadoop.version
+slf4j.version1.4.3/slf4j.version
+ /properties
+ dependencyManagement
+dependencies
+ dependency
+groupIdorg.apache.hadoop/groupId
+artifactIdhadoop-core/artifactId
+version${hadoop.version}/version
+scopeprovided/scope
+ /dependency
+/dependencies
+ /dependencyManagement
+/profile
+!-- profile for building against Hadoop 2.0.x
+Activate using: mvn -Dhadoop.profile=2.0 --
+profile
+ idhadoop-2.0/id
+ activation
+property
+ namehadoop.profile/name
+ value2.0/value
+/property
+ /activation
+ properties
+slf4j.version1.6.1/slf4j.version
+hadoop.version2.0.2-alpha/hadoop.version
+avro.version1.5.3/avro.version
+ /properties
+ dependencyManagement
+dependencies
+ dependency
+groupIdorg.apache.hadoop/groupId
+artifactIdhadoop-client/artifactId
+version${hadoop.version}/version
+scopeprovided/scope
[32/40] git commit: ACCUMULO-645: found more references to HADOOP_HOME
ACCUMULO-645: found more references to HADOOP_HOME git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1431596 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 02829fffc3ad9261648da5dd12a02dfcafa5a0fa) Reason: Hadoop2 compat Author: Eric C. Newton e...@apache.org Ref: ACCUMULO-1792 Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d70e5a12 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d70e5a12 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d70e5a12 Branch: refs/heads/master Commit: d70e5a12739a7775995340be3dca5d460cdf7be2 Parents: 344e725 Author: Eric C. Newton e...@apache.org Authored: Thu Jan 10 20:10:42 2013 + Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- bin/tool.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d70e5a12/bin/tool.sh -- diff --git a/bin/tool.sh b/bin/tool.sh index 3c114e8..cefd6b9 100755 --- a/bin/tool.sh +++ b/bin/tool.sh @@ -20,8 +20,8 @@ bin=`dirname $0` bin=`cd $bin; pwd` . $bin/config.sh -if [ -z $HADOOP_HOME ] ; then -echo HADOOP_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh +if [ -z $HADOOP_PREFIX ] ; then +echo HADOOP_PREFIX is not set. Please make sure it's set globally or in conf/accumulo-env.sh exit 1 fi if [ -z $ZOOKEEPER_HOME ] ; then @@ -98,5 +98,5 @@ fi #echo USERJARS=$USERJARS #echo CLASSNAME=$CLASSNAME #echo HADOOP_CLASSPATH=$HADOOP_CLASSPATH -#echo exec $HADOOP_HOME/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $ARGS -exec $HADOOP_HOME/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $@ +#echo exec $HADOOP_PREFIX/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $ARGS +exec $HADOOP_PREFIX/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $@
[27/40] git commit: ACCUMULO-1792 Cleanup test* system tests.
ACCUMULO-1792 Cleanup test* system tests. This patch most resembles work done in ACCUMULO-745. 745 is a massive patch applied to Accumulo 1.5 that changed all the command line handling of all of the programs that had main method. When this update was done, several of the concerned addressed in this patch were handled. Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/651033a5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/651033a5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/651033a5 Branch: refs/heads/master Commit: 651033a522f9b1ac51508e60c3cdcd6da02643d8 Parents: 8db6299 Author: Jonathan Hsieh j...@cloudera.com Authored: Sun Jul 7 13:06:27 2013 -0700 Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:43 2013 -0500 -- test/system/test1/README | 2 +- test/system/test2/concurrent.sh | 90 +++--- test/system/test3/bigrow.sh | 12 ++-- test/system/test4/bulk_import_test.sh | 32 +-- test/system/test5/insert_test.sh | 18 -- 5 files changed, 68 insertions(+), 86 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/651033a5/test/system/test1/README -- diff --git a/test/system/test1/README b/test/system/test1/README index 4c995fb..8003b3d 100644 --- a/test/system/test1/README +++ b/test/system/test1/README @@ -3,7 +3,7 @@ Command to run from command line #Can run this test with pre-existing splits... use the following command to create the table with #100 pre-existing splits -#../../../bin/accumulo 'org.apache.accumulo.server.test.TestIngest$CreateTable' 0 500 100 +#../../../bin/accumulo 'org.apache.accumulo.server.test.TestIngest$CreateTable' 0 500 100 user pw #could try running verify commands after stopping and restarting accumulo http://git-wip-us.apache.org/repos/asf/accumulo/blob/651033a5/test/system/test2/concurrent.sh -- diff --git a/test/system/test2/concurrent.sh b/test/system/test2/concurrent.sh index 69790a0..1ce9299 100755 --- a/test/system/test2/concurrent.sh +++ b/test/system/test2/concurrent.sh @@ -17,80 +17,80 @@ echo ingesting first halves (0 to (500K - 1), 1M to (1.5M - 1), etc) -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 0 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 100 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 200 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 300 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 400 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 0 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 100 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 200 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 300 1 +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 50 400 1 wait echo ingesting second halves (500K to (1M - 1), 1.5M to (2M - 1), etc) and verifying first halves -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 0 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 100 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 200 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 300 1 -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 400 1 +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 50 0 1 +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1
[32/39] git commit: ACCUMULO-645: found more references to HADOOP_HOME
ACCUMULO-645: found more references to HADOOP_HOME git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1431596 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 02829fffc3ad9261648da5dd12a02dfcafa5a0fa) Reason: Hadoop2 compat Author: Eric C. Newton e...@apache.org Ref: ACCUMULO-1792 Signed-off-by: Eric Newton eric.new...@gmail.com Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d70e5a12 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d70e5a12 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d70e5a12 Branch: refs/heads/1.6.0-SNAPSHOT Commit: d70e5a12739a7775995340be3dca5d460cdf7be2 Parents: 344e725 Author: Eric C. Newton e...@apache.org Authored: Thu Jan 10 20:10:42 2013 + Committer: Eric Newton eric.new...@gmail.com Committed: Mon Nov 25 16:06:44 2013 -0500 -- bin/tool.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d70e5a12/bin/tool.sh -- diff --git a/bin/tool.sh b/bin/tool.sh index 3c114e8..cefd6b9 100755 --- a/bin/tool.sh +++ b/bin/tool.sh @@ -20,8 +20,8 @@ bin=`dirname $0` bin=`cd $bin; pwd` . $bin/config.sh -if [ -z $HADOOP_HOME ] ; then -echo HADOOP_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh +if [ -z $HADOOP_PREFIX ] ; then +echo HADOOP_PREFIX is not set. Please make sure it's set globally or in conf/accumulo-env.sh exit 1 fi if [ -z $ZOOKEEPER_HOME ] ; then @@ -98,5 +98,5 @@ fi #echo USERJARS=$USERJARS #echo CLASSNAME=$CLASSNAME #echo HADOOP_CLASSPATH=$HADOOP_CLASSPATH -#echo exec $HADOOP_HOME/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $ARGS -exec $HADOOP_HOME/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $@ +#echo exec $HADOOP_PREFIX/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $ARGS +exec $HADOOP_PREFIX/bin/hadoop jar $TOOLJAR $CLASSNAME -libjars \$LIB_JARS\ $@
[01/39] git commit: ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility
Updated Branches:
refs/heads/1.6.0-SNAPSHOT f478737a1 - 6c80fa503
ACCUMULO-804 changed use of SocketInputStream for hadoop 2 compatibility
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1398373
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit ca1494d1508a3b1404ae9989d4211b00aa3ce307)
Reason: Hadoop2 compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc3fdf33
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fc3fdf33
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fc3fdf33
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: fc3fdf33716aa7105e1792c81dfb452fbf8c7944
Parents: aff0d64
Author: Billie Rinaldi bil...@apache.org
Authored: Mon Oct 15 16:32:24 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:41 2013 -0500
--
.../java/org/apache/accumulo/core/util/TTimeoutTransport.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fc3fdf33/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
index 6f74451..3c1fa6a 100644
---
a/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
+++
b/src/core/src/main/java/org/apache/accumulo/core/util/TTimeoutTransport.java
@@ -25,8 +25,7 @@ import java.net.Socket;
import java.net.SocketAddress;
import java.nio.channels.spi.SelectorProvider;
-import org.apache.hadoop.net.SocketInputStream;
-import org.apache.hadoop.net.SocketOutputStream;
+import org.apache.hadoop.net.NetUtils;
import org.apache.thrift.transport.TIOStreamTransport;
import org.apache.thrift.transport.TTransport;
@@ -37,8 +36,8 @@ public class TTimeoutTransport {
socket.setSoLinger(false, 0);
socket.setTcpNoDelay(true);
socket.connect(addr);
-InputStream input = new BufferedInputStream(new SocketInputStream(socket,
timeoutMillis), 1024 * 10);
-OutputStream output = new BufferedOutputStream(new
SocketOutputStream(socket, timeoutMillis), 1024 * 10);
+InputStream input = new
BufferedInputStream(NetUtils.getInputStream(socket, timeoutMillis), 1024 * 10);
+OutputStream output = new
BufferedOutputStream(NetUtils.getOutputStream(socket, timeoutMillis), 1024 *
10);
return new TIOStreamTransport(input, output);
}
}
[18/38] git commit: ACCUMULO-804 applied fixes to changes that broke compilation against hadoop 2.0
ACCUMULO-804 applied fixes to changes that broke compilation against hadoop 2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1431056
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 42cca8a3c910ec4d813b7611b2e65e70e57c6d66)
Reason: Hadoop2 compat
Author: Billie Rinaldi bil...@apache.org
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec2aaa6a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec2aaa6a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ec2aaa6a
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: ec2aaa6aff59fa65593641bf03b719a3147f3791
Parents: fc3fdf3
Author: Jonathan M Hsieh j...@cloudera.com
Authored: Wed May 29 13:16:18 2013 -0700
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../test/java/org/apache/accumulo/core/conf/PropertyTest.java | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec2aaa6a/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
--
diff --git
a/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
b/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
index f929921..551d042 100644
--- a/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
+++ b/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
@@ -92,5 +92,11 @@ public class PropertyTest {
typeCheckValidFormat(PropertyType.HOSTLIST, localhost,
server1,server2,server3, server1:,server2:, localhost:,
server2:,
www.server, www.server:, www.server.com,
www.server.com:111);
typeCheckInvalidFormat(PropertyType.HOSTLIST, :111, local host);
+
+typeCheckValidFormat(PropertyType.ABSOLUTEPATH, /foo, /foo/c, /);
+// in hadoop 2.0 Path only normalizes Windows paths properly when run on a
Windows system
+// this makes the following checks fail
+// typeCheckValidFormat(PropertyType.ABSOLUTEPATH, d:\\foo12,
c:\\foo\\g, c:\\foo\\c, c:\\);
+typeCheckInvalidFormat(PropertyType.ABSOLUTEPATH, foo12, foo/g,
foo\\c);
}
}
[20/38] git commit: ACCUMULO-287 added mock instance to AccumuloOutputFormat - merged to trunk
ACCUMULO-287 added mock instance to AccumuloOutputFormat - merged to trunk
git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/trunk@1229605
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 63545d307599b3f1c1db4884a61fe880911cef7a)
Reason: Testing
Author: Billie Rinaldi bil...@apache.org
merged uncleanly, left in deprecated things removed in 1.5. squashed in test
changes because AccumuloOutputFormatTest got created by ACCUMULO-287
independently in the 1.5 and 1.4 branches
Author: Sean Busbey bus...@cloudera.com
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/792af9a1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/792af9a1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/792af9a1
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 792af9a19133d81edb1e49e9e51407724a53cfc3
Parents: a3264e4
Author: Billie Rinaldi bil...@apache.org
Authored: Tue Jan 10 15:47:22 2012 +
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:42 2013 -0500
--
.../client/mapreduce/AccumuloOutputFormatTest.java | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/792af9a1/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
--
diff --git
a/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
b/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
index 8bc2b45..94e8bf0 100644
---
a/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
+++
b/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
@@ -33,7 +33,7 @@ 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.security.Authorizations;
-import org.apache.hadoop.conf.Configuration;
+import org.apache.accumulo.core.util.ContextFactory;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.mapreduce.Job;
@@ -41,7 +41,6 @@ import org.apache.hadoop.mapreduce.Mapper;
import org.apache.hadoop.mapreduce.RecordReader;
import org.apache.hadoop.mapreduce.RecordWriter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.junit.Test;
/**
@@ -94,11 +93,10 @@ public class AccumuloOutputFormatTest {
job.setOutputKeyClass(Text.class);
job.setOutputValueClass(Mutation.class);
job.setNumReduceTasks(0);
-Configuration conf = job.getConfiguration();
-AccumuloInputFormat.setInputInfo(conf, root, .getBytes(),
testtable1, new Authorizations());
-AccumuloInputFormat.setMockInstance(conf, testmrinstance);
-AccumuloOutputFormat.setOutputInfo(conf, root, .getBytes(), false,
testtable2);
-AccumuloOutputFormat.setMockInstance(conf, testmrinstance);
+AccumuloInputFormat.setInputInfo(job.getConfiguration(), root,
.getBytes(), testtable1, new Authorizations());
+AccumuloInputFormat.setMockInstance(job.getConfiguration(),
testmrinstance);
+AccumuloOutputFormat.setOutputInfo(job, root, .getBytes(), false,
testtable2);
+AccumuloOutputFormat.setMockInstance(job, testmrinstance);
AccumuloInputFormat input = new AccumuloInputFormat();
ListInputSplit splits = input.getSplits(job);
@@ -108,11 +106,10 @@ public class AccumuloOutputFormatTest {
TestMapper mapper = (TestMapper) job.getMapperClass().newInstance();
for (InputSplit split : splits) {
- TaskAttemptID id = new TaskAttemptID();
- TaskAttemptContext tac = new TaskAttemptContext(job.getConfiguration(),
id);
+ TaskAttemptContext tac = ContextFactory.createTaskAttemptContext(job);
RecordReaderKey,Value reader = input.createRecordReader(split, tac);
RecordWriterText,Mutation writer = output.getRecordWriter(tac);
- MapperKey,Value,Text,Mutation.Context context = mapper.new
Context(job.getConfiguration(), id, reader, writer, null, null, split);
+ MapperKey,Value,Text,Mutation.Context context =
ContextFactory.createMapContext(mapper, tac, reader, writer, split);
reader.initialize(split, context);
mapper.run(context);
writer.close(context);
[30/40] git commit: ACCUMULO-804 fix the functional tests for hadoop-2.0
ACCUMULO-804 fix the functional tests for hadoop-2.0
git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1458388
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 17ef9c25ef2970b02b4771217f4bdf06fa0517a8)
Reason: Hadoop2 Compat
Author: Eric C. Newton
Ref: ACCUMULO-1792
Signed-off-by: Eric Newton eric.new...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d5f16575
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d5f16575
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d5f16575
Branch: refs/heads/master
Commit: d5f16575f721d4fa7977dd1d1e8a9d9e7481b1ab
Parents: 4f7fb04
Author: Sean Busbey bus...@cloudera.com
Authored: Thu Oct 10 13:19:16 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Mon Nov 25 16:06:44 2013 -0500
--
test/system/auto/TestUtils.py | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d5f16575/test/system/auto/TestUtils.py
--
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index 0e1bf1a..f6eca67 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -67,6 +67,10 @@ $ACCUMULO_HOME/server/target/classes/,
$HADOOP_CONF_DIR,
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
log = logging.getLogger('test.auto')
[38/39] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ad9ee5e0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ad9ee5e0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ad9ee5e0 Branch: refs/heads/1.6.0-SNAPSHOT Commit: ad9ee5e06aae970516f2fb9b2400c07c45a94a5a Parents: f896c95 6446ad5 Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 10:46:39 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 10:46:39 2013 -0500 -- --
[07/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/11ba435a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/11ba435a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/11ba435a Branch: refs/heads/master Commit: 11ba435a4002ef44d18d0c646a3c7649943d7c80 Parents: ad9ee5e 51dd805 Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 11:04:02 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 11:04:02 2013 -0500 -- --
[02/10] git commit: ACCUMULO-1920 fix needs to be in 1.4 branch, too
ACCUMULO-1920 fix needs to be in 1.4 branch, too
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/51dd8050
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51dd8050
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/51dd8050
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 51dd805097eeca9404b78e5b332c9aebb09c9ed4
Parents: 6446ad5
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Nov 26 11:03:23 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Nov 26 11:03:23 2013 -0500
--
.../accumulo/core/zookeeper/ZooSession.java | 13 ---
.../apache/accumulo/server/monitor/Monitor.java | 24
2 files changed, 10 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/51dd8050/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
index 401be0a..b3db26f 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
@@ -18,10 +18,7 @@ package org.apache.accumulo.core.zookeeper;
import java.io.IOException;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -52,17 +49,7 @@ class ZooSession {
private static class AccumuloWatcher implements Watcher {
-private HashSetWatcher watchers = new HashSetWatcher();
-
public void process(WatchedEvent event) {
- // copy the watchers, in case the callback adds() more Watchers
- // otherwise we get a ConcurrentModificationException
- CollectionWatcher watcherCopy = new ArrayListWatcher(watchers);
-
- for (Watcher watcher : watcherCopy) {
-watcher.process(event);
- }
-
if (event.getState() == KeeperState.Expired) {
log.debug(Session expired, state of current session : +
event.getState());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/51dd8050/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
b/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
index 178d4f9..7a284f0 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
@@ -397,21 +397,17 @@ public class Monitor {
try {
// Read the gc location from its lock
ZooReaderWriter zk = ZooReaderWriter.getInstance();
- try {
-String path = ZooUtil.getRoot(HdfsZooInstance.getInstance()) +
Constants.ZGC_LOCK;
-ListString locks = zk.getChildren(path, null);
-if (locks != null locks.size() 0) {
- Collections.sort(locks);
- InetSocketAddress address = new ServerServices(new
String(zk.getData(path + / + locks.get(0),
null))).getAddress(Service.GC_CLIENT);
- GCMonitorService.Iface client = ThriftUtil.getClient(new
GCMonitorService.Client.Factory(), address,
ServerConfiguration.getSystemConfiguration());
- try {
-result = client.getStatus(null,
SecurityConstants.getSystemCredentials());
- } finally {
-ThriftUtil.returnClient(client);
- }
+ String path = ZooUtil.getRoot(HdfsZooInstance.getInstance()) +
Constants.ZGC_LOCK;
+ ListString locks = zk.getChildren(path, null);
+ if (locks != null locks.size() 0) {
+Collections.sort(locks);
+InetSocketAddress address = new ServerServices(new
String(zk.getData(path + / + locks.get(0),
null))).getAddress(Service.GC_CLIENT);
+GCMonitorService.Iface client = ThriftUtil.getClient(new
GCMonitorService.Client.Factory(), address,
ServerConfiguration.getSystemConfiguration());
+try {
+ result = client.getStatus(null,
SecurityConstants.getSystemCredentials());
+} finally {
+ ThriftUtil.returnClient(client);
}
- } finally {
-zk.close();
}
} catch (Exception ex) {
log.warn(Unable to contact the garbage collector, ex);
[10/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/2e4ce5e5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2e4ce5e5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2e4ce5e5 Branch: refs/heads/master Commit: 2e4ce5e52558f890cf5a6446f98763ee462ac2b0 Parents: abc3d69 dd55dc7 Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 11:04:34 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 11:04:34 2013 -0500 -- --
[01/10] git commit: ACCUMULO-1920 fix needs to be in 1.4 branch, too
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 6446ad5c2 - 51dd80509
refs/heads/1.5.1-SNAPSHOT ad9ee5e06 - 11ba435a4
refs/heads/1.6.0-SNAPSHOT 6c80fa503 - dd55dc7e2
refs/heads/master abc3d6993 - 2e4ce5e52
ACCUMULO-1920 fix needs to be in 1.4 branch, too
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/51dd8050
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51dd8050
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/51dd8050
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 51dd805097eeca9404b78e5b332c9aebb09c9ed4
Parents: 6446ad5
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Nov 26 11:03:23 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Nov 26 11:03:23 2013 -0500
--
.../accumulo/core/zookeeper/ZooSession.java | 13 ---
.../apache/accumulo/server/monitor/Monitor.java | 24
2 files changed, 10 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/51dd8050/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
index 401be0a..b3db26f 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
@@ -18,10 +18,7 @@ package org.apache.accumulo.core.zookeeper;
import java.io.IOException;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -52,17 +49,7 @@ class ZooSession {
private static class AccumuloWatcher implements Watcher {
-private HashSetWatcher watchers = new HashSetWatcher();
-
public void process(WatchedEvent event) {
- // copy the watchers, in case the callback adds() more Watchers
- // otherwise we get a ConcurrentModificationException
- CollectionWatcher watcherCopy = new ArrayListWatcher(watchers);
-
- for (Watcher watcher : watcherCopy) {
-watcher.process(event);
- }
-
if (event.getState() == KeeperState.Expired) {
log.debug(Session expired, state of current session : +
event.getState());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/51dd8050/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
b/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
index 178d4f9..7a284f0 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
@@ -397,21 +397,17 @@ public class Monitor {
try {
// Read the gc location from its lock
ZooReaderWriter zk = ZooReaderWriter.getInstance();
- try {
-String path = ZooUtil.getRoot(HdfsZooInstance.getInstance()) +
Constants.ZGC_LOCK;
-ListString locks = zk.getChildren(path, null);
-if (locks != null locks.size() 0) {
- Collections.sort(locks);
- InetSocketAddress address = new ServerServices(new
String(zk.getData(path + / + locks.get(0),
null))).getAddress(Service.GC_CLIENT);
- GCMonitorService.Iface client = ThriftUtil.getClient(new
GCMonitorService.Client.Factory(), address,
ServerConfiguration.getSystemConfiguration());
- try {
-result = client.getStatus(null,
SecurityConstants.getSystemCredentials());
- } finally {
-ThriftUtil.returnClient(client);
- }
+ String path = ZooUtil.getRoot(HdfsZooInstance.getInstance()) +
Constants.ZGC_LOCK;
+ ListString locks = zk.getChildren(path, null);
+ if (locks != null locks.size() 0) {
+Collections.sort(locks);
+InetSocketAddress address = new ServerServices(new
String(zk.getData(path + / + locks.get(0),
null))).getAddress(Service.GC_CLIENT);
+GCMonitorService.Iface client = ThriftUtil.getClient(new
GCMonitorService.Client.Factory(), address,
ServerConfiguration.getSystemConfiguration());
+try {
+ result = client.getStatus(null,
SecurityConstants.getSystemCredentials());
+} finally {
+ ThriftUtil.returnClient(client);
}
- } finally {
-zk.close();
}
} catch (Exception ex) {
log.warn(Unable to contact the garbage
[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/11ba435a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/11ba435a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/11ba435a Branch: refs/heads/1.5.1-SNAPSHOT Commit: 11ba435a4002ef44d18d0c646a3c7649943d7c80 Parents: ad9ee5e 51dd805 Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 11:04:02 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 11:04:02 2013 -0500 -- --
[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/11ba435a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/11ba435a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/11ba435a Branch: refs/heads/1.6.0-SNAPSHOT Commit: 11ba435a4002ef44d18d0c646a3c7649943d7c80 Parents: ad9ee5e 51dd805 Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 11:04:02 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 11:04:02 2013 -0500 -- --
[04/10] git commit: ACCUMULO-1920 fix needs to be in 1.4 branch, too
ACCUMULO-1920 fix needs to be in 1.4 branch, too
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/51dd8050
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51dd8050
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/51dd8050
Branch: refs/heads/master
Commit: 51dd805097eeca9404b78e5b332c9aebb09c9ed4
Parents: 6446ad5
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Nov 26 11:03:23 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Nov 26 11:03:23 2013 -0500
--
.../accumulo/core/zookeeper/ZooSession.java | 13 ---
.../apache/accumulo/server/monitor/Monitor.java | 24
2 files changed, 10 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/51dd8050/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
--
diff --git
a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
index 401be0a..b3db26f 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
@@ -18,10 +18,7 @@ package org.apache.accumulo.core.zookeeper;
import java.io.IOException;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -52,17 +49,7 @@ class ZooSession {
private static class AccumuloWatcher implements Watcher {
-private HashSetWatcher watchers = new HashSetWatcher();
-
public void process(WatchedEvent event) {
- // copy the watchers, in case the callback adds() more Watchers
- // otherwise we get a ConcurrentModificationException
- CollectionWatcher watcherCopy = new ArrayListWatcher(watchers);
-
- for (Watcher watcher : watcherCopy) {
-watcher.process(event);
- }
-
if (event.getState() == KeeperState.Expired) {
log.debug(Session expired, state of current session : +
event.getState());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/51dd8050/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
--
diff --git
a/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
b/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
index 178d4f9..7a284f0 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
@@ -397,21 +397,17 @@ public class Monitor {
try {
// Read the gc location from its lock
ZooReaderWriter zk = ZooReaderWriter.getInstance();
- try {
-String path = ZooUtil.getRoot(HdfsZooInstance.getInstance()) +
Constants.ZGC_LOCK;
-ListString locks = zk.getChildren(path, null);
-if (locks != null locks.size() 0) {
- Collections.sort(locks);
- InetSocketAddress address = new ServerServices(new
String(zk.getData(path + / + locks.get(0),
null))).getAddress(Service.GC_CLIENT);
- GCMonitorService.Iface client = ThriftUtil.getClient(new
GCMonitorService.Client.Factory(), address,
ServerConfiguration.getSystemConfiguration());
- try {
-result = client.getStatus(null,
SecurityConstants.getSystemCredentials());
- } finally {
-ThriftUtil.returnClient(client);
- }
+ String path = ZooUtil.getRoot(HdfsZooInstance.getInstance()) +
Constants.ZGC_LOCK;
+ ListString locks = zk.getChildren(path, null);
+ if (locks != null locks.size() 0) {
+Collections.sort(locks);
+InetSocketAddress address = new ServerServices(new
String(zk.getData(path + / + locks.get(0),
null))).getAddress(Service.GC_CLIENT);
+GCMonitorService.Iface client = ThriftUtil.getClient(new
GCMonitorService.Client.Factory(), address,
ServerConfiguration.getSystemConfiguration());
+try {
+ result = client.getStatus(null,
SecurityConstants.getSystemCredentials());
+} finally {
+ ThriftUtil.returnClient(client);
}
- } finally {
-zk.close();
}
} catch (Exception ex) {
log.warn(Unable to contact the garbage collector, ex);
[08/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.1-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/dd55dc7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd55dc7e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dd55dc7e Branch: refs/heads/1.6.0-SNAPSHOT Commit: dd55dc7e242e4ecf48196812a718e608be7bac5b Parents: 6c80fa5 11ba435 Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 11:04:22 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 11:04:22 2013 -0500 -- --
[09/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.1-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/dd55dc7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd55dc7e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dd55dc7e Branch: refs/heads/master Commit: dd55dc7e242e4ecf48196812a718e608be7bac5b Parents: 6c80fa5 11ba435 Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 11:04:22 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 11:04:22 2013 -0500 -- --
git commit: ACCUMULO-1854 Remove compiler warnings
Updated Branches:
refs/heads/1.6.0-SNAPSHOT dd55dc7e2 - f8e14c794
ACCUMULO-1854 Remove compiler warnings
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f8e14c79
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f8e14c79
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f8e14c79
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: f8e14c794992bd5d8d530b50338b16436088c243
Parents: dd55dc7
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Nov 26 13:16:17 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Nov 26 13:16:17 2013 -0500
--
.../core/client/mapreduce/RangeInputSplit.java | 81 ++--
.../mapreduce/AccumuloInputFormatTest.java | 18 +++--
.../accumulo/test/functional/ExamplesIT.java| 27 ---
3 files changed, 70 insertions(+), 56 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8e14c79/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
index 59cc8d8..98b1a32 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
@@ -20,7 +20,6 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.math.BigInteger;
-import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -132,6 +131,7 @@ public class RangeInputSplit extends InputSplit implements
Writable {
/**
* This implementation of length is only an estimate, it does not provide
exact values. Do not have your code rely on this return value.
*/
+ @Override
public long getLength() throws IOException {
Text startRow = range.isInfiniteStartKey() ? new Text(new byte[]
{Byte.MIN_VALUE}) : range.getStartKey().getRow();
Text stopRow = range.isInfiniteStopKey() ? new Text(new byte[]
{Byte.MAX_VALUE}) : range.getEndKey().getRow();
@@ -151,10 +151,12 @@ public class RangeInputSplit extends InputSplit
implements Writable {
return diff + 1;
}
+ @Override
public String[] getLocations() throws IOException {
return locations;
}
+ @Override
public void readFields(DataInput in) throws IOException {
range.readFields(in);
tableName = in.readUTF();
@@ -163,42 +165,42 @@ public class RangeInputSplit extends InputSplit
implements Writable {
locations = new String[numLocs];
for (int i = 0; i numLocs; ++i)
locations[i] = in.readUTF();
-
+
if (in.readBoolean()) {
isolatedScan = in.readBoolean();
}
-
+
if (in.readBoolean()) {
offline = in.readBoolean();
}
-
+
if (in.readBoolean()) {
localIterators = in.readBoolean();
}
-
+
if (in.readBoolean()) {
mockInstance = in.readBoolean();
}
-
+
if (in.readBoolean()) {
int numColumns = in.readInt();
ListString columns = new ArrayListString(numColumns);
for (int i = 0; i numColumns; i++) {
columns.add(in.readUTF());
}
-
+
fetchedColumns = InputConfigurator.deserializeFetchedColumns(columns);
}
-
+
if (in.readBoolean()) {
String strAuths = in.readUTF();
auths = new Authorizations(strAuths.getBytes(Constants.UTF8));
}
-
+
if (in.readBoolean()) {
principal = in.readUTF();
}
-
+
if (in.readBoolean()) {
int ordinal = in.readInt();
this.tokenSource = TokenSource.values()[ordinal];
@@ -208,32 +210,33 @@ public class RangeInputSplit extends InputSplit
implements Writable {
String tokenClass = in.readUTF();
byte[] base64TokenBytes = in.readUTF().getBytes(Constants.UTF8);
byte[] tokenBytes = Base64.decodeBase64(base64TokenBytes);
-
+
this.token = AuthenticationTokenSerializer.deserialize(tokenClass,
tokenBytes);
break;
-
+
case FILE:
this.tokenFile = in.readUTF();
-
+
break;
default:
- throw new IOException(Cannot parse unknown TokenSource ordinal);
+ throw new IOException(Cannot parse unknown TokenSource ordinal);
}
}
-
+
if (in.readBoolean()) {
instanceName = in.readUTF();
}
-
+
if (in.readBoolean()) {
zooKeepers = in.readUTF();
}
-
+
if (in.readBoolean()) {
level = Level.toLevel(in.readInt());
}
}
+
[5/5] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a550169d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a550169d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a550169d Branch: refs/heads/1.5.1-SNAPSHOT Commit: a550169d14c82834aa51b5511e94d8bb3b6c3464 Parents: 11ba435 394b2b2 Author: Eric Newton eric.new...@gmail.com Authored: Tue Nov 26 15:05:39 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Tue Nov 26 15:05:39 2013 -0500 -- --
