hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From syuanji...@apache.org
Subject [11/17] hbase git commit: HBASE-14728 TestRowCounter is broken in master (Abhishek Singh Chouhan)
Date Mon, 02 Nov 2015 18:39:34 GMT
HBASE-14728 TestRowCounter is broken in master (Abhishek Singh Chouhan)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/47659200
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/47659200
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/47659200

Branch: refs/heads/hbase-12439
Commit: 47659200ac1d53590379ff431c428dffc07fd06a
Parents: 9c37239
Author: stack <stack@apache.org>
Authored: Sun Nov 1 22:22:59 2015 -0800
Committer: stack <stack@apache.org>
Committed: Sun Nov 1 22:22:59 2015 -0800

----------------------------------------------------------------------
 conf/hbase-env.cmd                                        |  4 ----
 conf/hbase-env.sh                                         |  4 ----
 dev-support/jenkinsEnv.sh                                 |  2 +-
 dev-support/publish_hbase_website.sh                      |  4 ++--
 .../org/apache/hadoop/hbase/mapreduce/TestRowCounter.java | 10 +++++++---
 hbase-spark/pom.xml                                       |  2 +-
 pom.xml                                                   |  6 +++---
 7 files changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/47659200/conf/hbase-env.cmd
----------------------------------------------------------------------
diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd
index 9fb87d7..003d1b3 100644
--- a/conf/hbase-env.cmd
+++ b/conf/hbase-env.cmd
@@ -42,10 +42,6 @@
 @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%

http://git-wip-us.apache.org/repos/asf/hbase/blob/47659200/conf/hbase-env.sh
----------------------------------------------------------------------
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index b7d00d1..e0a1432 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -42,10 +42,6 @@
 # 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.

http://git-wip-us.apache.org/repos/asf/hbase/blob/47659200/dev-support/jenkinsEnv.sh
----------------------------------------------------------------------
diff --git a/dev-support/jenkinsEnv.sh b/dev-support/jenkinsEnv.sh
index 6961437..d7fe873 100755
--- a/dev-support/jenkinsEnv.sh
+++ b/dev-support/jenkinsEnv.sh
@@ -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 -XX:MaxPermSize=256m"}"
+export MAVEN_OPTS="${MAVEN_OPTS:-"-Xmx3100M -XX:-UsePerfData"}"
 
 ulimit -n
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/47659200/dev-support/publish_hbase_website.sh
----------------------------------------------------------------------
diff --git a/dev-support/publish_hbase_website.sh b/dev-support/publish_hbase_website.sh
index 1560bcf..406a645 100755
--- a/dev-support/publish_hbase_website.sh
+++ b/dev-support/publish_hbase_website.sh
@@ -90,7 +90,7 @@ if [ -z "$SVN_DIR" ]; then
   SVN_DIR="$HOME/svn/hbase.apache.org/trunk"
 fi
 
-export MAVEN_OPTS=${MAVEN_OPTS:-"-Xmx3g -XX:MaxPermSize=256m"}
+export MAVEN_OPTS=${MAVEN_OPTS:-"-Xmx3g"}
 
 cd $GIT_DIR
 
@@ -257,4 +257,4 @@ else
   echo "Commit message:"
   cat /tmp/commit.txt
   svn commit -q -F /tmp/commit.txt
-fi
\ No newline at end of file
+fi

http://git-wip-us.apache.org/repos/asf/hbase/blob/47659200/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java
index 1bd2437..fe2e197 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java
@@ -38,6 +38,8 @@ 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;
@@ -203,9 +205,11 @@ public class TestRowCounter {
    * @throws Exception
    */
   private void runRowCount(String[] args, int expectedCount) throws Exception {
-    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));
+    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());
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/hbase/blob/47659200/hbase-spark/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml
index ec911bd..6152787 100644
--- a/hbase-spark/pom.xml
+++ b/hbase-spark/pom.xml
@@ -587,7 +587,7 @@
                         <configuration>
                             <tagsToExclude>Integration-Test</tagsToExclude>
                             <argLine>
-                                -Xmx1536m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=512m
+                                -Xmx1536m -XX:ReservedCodeCacheSize=512m
                             </argLine>
                             <parallel>false</parallel>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/hbase/blob/47659200/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5834024..6bad363 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1250,10 +1250,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}
-      -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
+       -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} -XX:MaxPermSize=256m
+    <hbase-surefire.cygwin-argLine>-enableassertions -Xmx${surefire.cygwinXmx} 
       -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
       "-Djava.library.path=${hadoop.library.path};${java.library.path}"
     </hbase-surefire.cygwin-argLine>
@@ -2650,7 +2650,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 -XX:MaxPermSize=512m" mvn clean package -Pclover site -->
+         MAVEN_OPTS="-Xmx2048m" mvn clean package -Pclover site -->
     <profile>
       <id>clover</id>
       <activation>


Mime
View raw message