Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A91C511ADD for ; Fri, 21 Feb 2014 04:26:12 +0000 (UTC) Received: (qmail 48684 invoked by uid 500); 21 Feb 2014 04:26:12 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 48639 invoked by uid 500); 21 Feb 2014 04:26:10 -0000 Mailing-List: contact commits-help@tez.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.incubator.apache.org Delivered-To: mailing list commits@tez.incubator.apache.org Received: (qmail 48625 invoked by uid 99); 21 Feb 2014 04:26:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Feb 2014 04:26:08 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 21 Feb 2014 04:26:07 +0000 Received: (qmail 48579 invoked by uid 99); 21 Feb 2014 04:25:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Feb 2014 04:25:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9D1CF92B501; Fri, 21 Feb 2014 04:25:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hitesh@apache.org To: commits@tez.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: TEZ-289. DAGAppMasterShutdownHook should not report KILLED when exception brings down AM. (Tsuyoshi Ozawa via hitesh) Date: Fri, 21 Feb 2014 04:25:46 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-tez Updated Branches: refs/heads/master 8884ee446 -> e4c2a8253 TEZ-289. DAGAppMasterShutdownHook should not report KILLED when exception brings down AM. (Tsuyoshi Ozawa via hitesh) Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/e4c2a825 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/e4c2a825 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/e4c2a825 Branch: refs/heads/master Commit: e4c2a82533fd8032e78a8c4dda3ff7216f85fc7a Parents: 8884ee4 Author: Hitesh Shah Authored: Thu Feb 20 20:09:21 2014 -0800 Committer: Hitesh Shah Committed: Thu Feb 20 20:09:21 2014 -0800 ---------------------------------------------------------------------- tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/e4c2a825/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java index d4a96d4..cafcd3c 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/DAGAppMaster.java @@ -1544,11 +1544,13 @@ public class DAGAppMaster extends AbstractService { } if (EnumSet.of(DAGAppMasterState.NEW, DAGAppMasterState.INITED, - DAGAppMasterState.IDLE, DAGAppMasterState.RUNNING) - .contains(appMaster.state)) { + DAGAppMasterState.IDLE).contains(appMaster.state)) { // DAG not in a final state. Must have receive a KILL signal appMaster.state = DAGAppMasterState.KILLED; + } else if (appMaster.state == DAGAppMasterState.RUNNING) { + appMaster.state = DAGAppMasterState.ERROR; } + appMaster.stop(); } }