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 35E7E200BE4 for ; Wed, 21 Dec 2016 14:52:27 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 34634160B26; Wed, 21 Dec 2016 13:52:27 +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 7DD6B160B0C for ; Wed, 21 Dec 2016 14:52:26 +0100 (CET) Received: (qmail 88039 invoked by uid 500); 21 Dec 2016 13:52:25 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 88028 invoked by uid 99); 21 Dec 2016 13:52:24 -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; Wed, 21 Dec 2016 13:52:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7F1BDFBAD; Wed, 21 Dec 2016 13:52:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctang@apache.org To: commits@hive.apache.org Message-Id: <5d03741e075d4e1f8d5dd4f3fbdd7101@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-15446: Hive fails in recursive debug (Chaoyu Tang, reviewed by Naveen Gangam) Date: Wed, 21 Dec 2016 13:52:24 +0000 (UTC) archived-at: Wed, 21 Dec 2016 13:52:27 -0000 Repository: hive Updated Branches: refs/heads/master c531ae1a2 -> 66f13472e HIVE-15446: Hive fails in recursive debug (Chaoyu Tang, reviewed by Naveen Gangam) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/66f13472 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/66f13472 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/66f13472 Branch: refs/heads/master Commit: 66f13472e94a18cdc83093d6426b1cc494ab9405 Parents: c531ae1 Author: Chaoyu Tang Authored: Wed Dec 21 08:51:10 2016 -0500 Committer: Chaoyu Tang Committed: Wed Dec 21 08:51:10 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/66f13472/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java index 17db852..1bd4db7 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/MapRedTask.java @@ -342,6 +342,15 @@ public class MapRedTask extends ExecDriver implements Serializable { + " environment variable must be set to \"y\" or \"n\" when debugging"; if (environmentVariables.get(HIVE_DEBUG_RECURSIVE).equals("y")) { + // HADOOP_CLIENT_OPTS is appended to HADOOP_OPTS in HADOOP.sh, so we should remove the old + // HADOOP_CLIENT_OPTS which might have the main debug options from current HADOOP_OPTS. A new + // HADOOP_CLIENT_OPTS is created with child JVM debug options, and it will be appended to + // HADOOP_OPTS agina when HADOOP.sh is executed for the child process. + assert environmentVariables.containsKey(HADOOP_OPTS_KEY) + && environmentVariables.get(HADOOP_OPTS_KEY) != null: HADOOP_OPTS_KEY + + " environment variable must have been set."; + environmentVariables.put(HADOOP_OPTS_KEY, environmentVariables.get(HADOOP_OPTS_KEY) + .replace(environmentVariables.get(HADOOP_CLIENT_OPTS), "")); // swap debug options in HADOOP_CLIENT_OPTS to those that the child JVM should have assert environmentVariables.containsKey(HIVE_CHILD_CLIENT_DEBUG_OPTS) && environmentVariables.get(HIVE_CHILD_CLIENT_DEBUG_OPTS) != null : HIVE_CHILD_CLIENT_DEBUG_OPTS