Revert "HBASE-14728 TestRowCounter is broken in master (Abhishek Singh Chouhan)"

Revert because I overcommitted, included files from another patch.

This reverts commit 47659200ac.
This commit is contained in:
stack 2015-11-02 08:06:34 -08:00
parent 7368344585
commit 950050e9d6
7 changed files with 18 additions and 14 deletions

View File

@ -42,6 +42,10 @@
@rem @rem See TestIPv6NIOServerSocketChannel.
set HBASE_OPTS="-XX:+UseConcMarkSweepGC" "-Djava.net.preferIPv4Stack=true"
@rem Configure PermSize. Only needed in JDK7. You can safely remove it for JDK8+
set HBASE_MASTER_OPTS=%HBASE_MASTER_OPTS% "-XX:PermSize=128m" "-XX:MaxPermSize=128m"
set HBASE_REGIONSERVER_OPTS=%HBASE_REGIONSERVER_OPTS% "-XX:PermSize=128m" "-XX:MaxPermSize=128m"
@rem Uncomment below to enable java garbage collection logging for the server-side processes
@rem this enables basic gc logging for the server processes to the .out file
@rem set SERVER_GC_OPTS="-verbose:gc" "-XX:+PrintGCDetails" "-XX:+PrintGCDateStamps" %HBASE_GC_OPTS%

View File

@ -42,6 +42,10 @@
# see http://wiki.apache.org/hadoop/PerformanceTuning
export HBASE_OPTS="-XX:+UseConcMarkSweepGC"
# Configure PermSize. Only needed in JDK7. You can safely remove it for JDK8+
export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -XX:PermSize=128m -XX:MaxPermSize=128m"
export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -XX:PermSize=128m -XX:MaxPermSize=128m"
# Uncomment one of the below three options to enable java garbage collection logging for the server-side processes.
# This enables basic gc logging to the .out file.

View File

@ -30,7 +30,7 @@ export CLOVER_HOME=/home/jenkins/tools/clover/latest
export MAVEN_HOME=/home/jenkins/tools/maven/latest
export PATH=$PATH:$JAVA_HOME/bin:$ANT_HOME/bin:
export MAVEN_OPTS="${MAVEN_OPTS:-"-Xmx3100M -XX:-UsePerfData"}"
export MAVEN_OPTS="${MAVEN_OPTS:-"-Xmx3100M -XX:-UsePerfData -XX:MaxPermSize=256m"}"
ulimit -n

View File

@ -90,7 +90,7 @@ if [ -z "$SVN_DIR" ]; then
SVN_DIR="$HOME/svn/hbase.apache.org/trunk"
fi
export MAVEN_OPTS=${MAVEN_OPTS:-"-Xmx3g"}
export MAVEN_OPTS=${MAVEN_OPTS:-"-Xmx3g -XX:MaxPermSize=256m"}
cd $GIT_DIR
@ -257,4 +257,4 @@ else
echo "Commit message:"
cat /tmp/commit.txt
svn commit -q -F /tmp/commit.txt
fi
fi

View File

@ -38,8 +38,6 @@ import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.LauncherSecurityManager;
import org.apache.hadoop.mapreduce.Counter;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.util.ToolRunner;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@ -205,11 +203,9 @@ public class TestRowCounter {
* @throws Exception
*/
private void runRowCount(String[] args, int expectedCount) throws Exception {
Job job = RowCounter.createSubmittableJob(TEST_UTIL.getConfiguration(), args);
job.waitForCompletion(true);
assertTrue(job.isSuccessful());
Counter counter = job.getCounters().findCounter(RowCounter.RowCounterMapper.Counters.ROWS);
assertEquals(expectedCount, counter.getValue());
final RowCounter counter = new RowCounter();
assertEquals("job failed either due to failure or miscount (see log output).", 0,
ToolRunner.run(TEST_UTIL.getConfiguration(), counter, args));
}
/**

View File

@ -587,7 +587,7 @@
<configuration>
<tagsToExclude>Integration-Test</tagsToExclude>
<argLine>
-Xmx1536m -XX:ReservedCodeCacheSize=512m
-Xmx1536m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=512m
</argLine>
<parallel>false</parallel>
</configuration>

View File

@ -1252,10 +1252,10 @@
<!--Mark our test runs with '-Dhbase.test' so we can identify a surefire test as ours in a process listing
-->
<hbase-surefire.argLine>-enableassertions -Dhbase.test -Xmx${surefire.Xmx}
-Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
-XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
-Djava.awt.headless=true
</hbase-surefire.argLine>
<hbase-surefire.cygwin-argLine>-enableassertions -Xmx${surefire.cygwinXmx}
<hbase-surefire.cygwin-argLine>-enableassertions -Xmx${surefire.cygwinXmx} -XX:MaxPermSize=256m
-Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
"-Djava.library.path=${hadoop.library.path};${java.library.path}"
</hbase-surefire.cygwin-argLine>
@ -2632,7 +2632,7 @@
or you can provide the license with -Dmaven.clover.licenseLocation=/path/to/license. Committers can find
the license under https://svn.apache.org/repos/private/committers/donated-licenses/clover/
The report will be generated under target/site/clover/index.html when you run
MAVEN_OPTS="-Xmx2048m" mvn clean package -Pclover site -->
MAVEN_OPTS="-Xmx2048m -XX:MaxPermSize=512m" mvn clean package -Pclover site -->
<profile>
<id>clover</id>
<activation>