You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/03/19 22:51:46 UTC
svn commit: r1458530 - in /accumulo/trunk: ./ assemble/
conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/
conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/
conf/examples/3GB/native-standalone/ conf/examples/3GB/standal...
Author: ecn
Date: Tue Mar 19 21:51:46 2013
New Revision: 1458530
URL: http://svn.apache.org/r1458530
Log:
ACCUMULO-804 more testing finds more 2.0 issues
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml
accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml
accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml
accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml
accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml
accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml
accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml
accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml
accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
accumulo/trunk/test/system/auto/TestUtils.py
accumulo/trunk/test/system/auto/stress/msplit.py
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1458529
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1458529
Modified: accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml Tue Mar 19 21:51:46 2013
@@ -92,6 +92,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/server/target/classes/,
Modified: accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml Tue Mar 19 21:51:46 2013
@@ -87,6 +87,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/server/target/classes/,
Modified: accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml Tue Mar 19 21:51:46 2013
@@ -82,6 +82,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/server/target/classes/,
Modified: accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml Tue Mar 19 21:51:46 2013
@@ -84,6 +84,14 @@
<property>
<name>general.classpaths</name>
+ <!--
+ Add the following for hadoop-2.0
+ $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,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+ -->
<value>
$ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/core/target/classes/,
Modified: accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml Tue Mar 19 21:51:46 2013
@@ -77,6 +77,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/server/target/classes/,
Modified: accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml Tue Mar 19 21:51:46 2013
@@ -77,6 +77,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/server/target/classes/,
Modified: accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml Tue Mar 19 21:51:46 2013
@@ -87,6 +87,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/server/target/classes/,
Modified: accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml Tue Mar 19 21:51:46 2013
@@ -91,6 +91,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/server/target/classes/,
Modified: accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml Tue Mar 19 21:51:46 2013
@@ -76,6 +76,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/server/target/classes/,
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1458529
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1458529
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1458529
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1458529
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1458529
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1458529
Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java Tue Mar 19 21:51:46 2013
@@ -44,7 +44,7 @@ public class LargeRowTest extends Functi
private static final String PRE_SPLIT_TABLE_NAME = "lrps";
private static final int NUM_ROWS = 100;
private static final int ROW_SIZE = 1 << 17;
- private static final int SPLIT_THRESH = ROW_SIZE * NUM_ROWS / 5;
+ private static final int SPLIT_THRESH = ROW_SIZE * NUM_ROWS / 4;
private static final int NUM_PRE_SPLITS = 9;
@Override
Modified: accumulo/trunk/test/system/auto/TestUtils.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/TestUtils.py?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/TestUtils.py (original)
+++ accumulo/trunk/test/system/auto/TestUtils.py Tue Mar 19 21:51:46 2013
@@ -64,6 +64,7 @@ $ACCUMULO_HOME/server/target/classes/,
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
"""
log = logging.getLogger('test.auto')
Modified: accumulo/trunk/test/system/auto/stress/msplit.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/stress/msplit.py?rev=1458530&r1=1458529&r2=1458530&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/stress/msplit.py (original)
+++ accumulo/trunk/test/system/auto/stress/msplit.py Tue Mar 19 21:51:46 2013
@@ -35,6 +35,7 @@ class MetaSplitTest(TabletShouldSplit):
}
tableSettings['test_ingest'] = {
'table.split.threshold': '200K',
+ 'table.file.compress.blocksize': '10K',
}
def runTest(self):