tez git commit: TEZ-3258. Jvm Checker does not ignore DisableExplicitGC when checking JVM GC options. (Fengdong Yu via hitesh)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.8 6e02c5c70 -> de69be521


TEZ-3258. Jvm Checker does not ignore DisableExplicitGC when checking JVM GC 
options. (Fengdong Yu via hitesh)

(cherry picked from commit d22389cc23175379edd5858d2654282973a2f5dc)

Conflicts:
        CHANGES.txt


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

Branch: refs/heads/branch-0.8
Commit: de69be521858248de28af9da6f10ece1ba72b619
Parents: 6e02c5c
Author: Hitesh Shah <hit...@apache.org>
Authored: Tue May 17 07:51:19 2016 -0700
Committer: Hitesh Shah <hit...@apache.org>
Committed: Tue May 17 07:53:05 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                      | 4 +++-
 tez-api/src/main/java/org/apache/tez/common/JavaOptsChecker.java | 2 +-
 .../src/test/java/org/apache/tez/common/TestJavaOptsChecker.java | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/de69be52/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ae490dc..182df07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
 
 ALL CHANGES:
 
+  TEZ-3258. Jvm Checker does not ignore DisableExplicitGC when checking JVM GC 
options.
   TEZ-3256. [Backport HADOOP-11032] Remove Guava Stopwatch dependency
   TEZ-2342. Reduce bytearray copy with TezEvent Serialization and 
deserialization
   TEZ-3251. Allow ability to add custom counters to TaskRunner2Callable.
@@ -448,10 +449,11 @@ Release 0.7.2: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-3258. Jvm Checker does not ignore DisableExplicitGC when checking JVM GC 
options.
   TEZ-3256. [Backport HADOOP-11032] Remove Guava Stopwatch dependency
   TEZ-2342. Reduce bytearray copy with TezEvent Serialization and 
deserialization
 
-Release 0.7.1: Unreleased
+Release 0.7.1: 2016-05-10
 
 INCOMPATIBLE CHANGES
   TEZ-2679. Admin forms of launch env settings

http://git-wip-us.apache.org/repos/asf/tez/blob/de69be52/tez-api/src/main/java/org/apache/tez/common/JavaOptsChecker.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/common/JavaOptsChecker.java 
b/tez-api/src/main/java/org/apache/tez/common/JavaOptsChecker.java
index 7e7c231..6de402a 100644
--- a/tez-api/src/main/java/org/apache/tez/common/JavaOptsChecker.java
+++ b/tez-api/src/main/java/org/apache/tez/common/JavaOptsChecker.java
@@ -48,7 +48,7 @@ public class JavaOptsChecker {
       }
 
       String opt = matcher.group(3);
-      if (!opt.endsWith("GC")) {
+      if (!opt.matches("Use.+GC")) {
         continue;
       }
 

http://git-wip-us.apache.org/repos/asf/tez/blob/de69be52/tez-api/src/test/java/org/apache/tez/common/TestJavaOptsChecker.java
----------------------------------------------------------------------
diff --git 
a/tez-api/src/test/java/org/apache/tez/common/TestJavaOptsChecker.java 
b/tez-api/src/test/java/org/apache/tez/common/TestJavaOptsChecker.java
index 07eb9b6..7f86e14 100644
--- a/tez-api/src/test/java/org/apache/tez/common/TestJavaOptsChecker.java
+++ b/tez-api/src/test/java/org/apache/tez/common/TestJavaOptsChecker.java
@@ -93,6 +93,9 @@ public class TestJavaOptsChecker {
     String opts = " -XX:+UseParNewGC -XX:+UseConcMarkSweepGC ";
     javaOptsChecker.checkOpts(opts);
 
+    opts += " -XX:+DisableExplicitGC ";
+    javaOptsChecker.checkOpts(opts);
+
     opts += " -XX:-UseG1GC ";
     javaOptsChecker.checkOpts(opts);