You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by hi...@apache.org on 2016/05/17 14:55:22 UTC
[2/2] tez git commit: TEZ-3258. Jvm Checker does not ignore
DisableExplicitGC when checking JVM GC options. (Fengdong Yu via hitesh)
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
(cherry picked from commit de69be521858248de28af9da6f10ece1ba72b619)
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/c6edff29
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/c6edff29
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/c6edff29
Branch: refs/heads/branch-0.7
Commit: c6edff292fc6236fcf0ef654356765e3ff82b32f
Parents: ad3df8d
Author: Hitesh Shah <hi...@apache.org>
Authored: Tue May 17 07:51:19 2016 -0700
Committer: Hitesh Shah <hi...@apache.org>
Committed: Tue May 17 07:55:01 2016 -0700
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
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, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/c6edff29/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2754b92..9d8972c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,11 +6,12 @@ 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
TEZ-3243. Output vertices are hidden for UI graph view
-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/c6edff29/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/c6edff29/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);