Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4C69D2009A8 for ; Tue, 17 May 2016 16:55:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4AFE3160A1F; Tue, 17 May 2016 14:55:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9CDF41609F5 for ; Tue, 17 May 2016 16:55:22 +0200 (CEST) Received: (qmail 55102 invoked by uid 500); 17 May 2016 14:55:21 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 55093 invoked by uid 99); 17 May 2016 14:55:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2016 14:55:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 80180DFE16; Tue, 17 May 2016 14:55:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hitesh@apache.org To: commits@tez.apache.org Date: Tue, 17 May 2016 14:55:22 -0000 Message-Id: <50493e13ec3e49f8bc1dd7d443c7d6cb@git.apache.org> In-Reply-To: <8f55806f95ae405cbdbef9577db23f01@git.apache.org> References: <8f55806f95ae405cbdbef9577db23f01@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] tez git commit: TEZ-3258. Jvm Checker does not ignore DisableExplicitGC when checking JVM GC options. (Fengdong Yu via hitesh) archived-at: Tue, 17 May 2016 14:55:23 -0000 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 Authored: Tue May 17 07:51:19 2016 -0700 Committer: Hitesh Shah 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);