Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 84A3A1917F for ; Mon, 11 Apr 2016 14:38:34 +0000 (UTC) Received: (qmail 81272 invoked by uid 500); 11 Apr 2016 14:38:34 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 81210 invoked by uid 500); 11 Apr 2016 14:38:34 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 81028 invoked by uid 99); 11 Apr 2016 14:38:33 -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; Mon, 11 Apr 2016 14:38:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 73BBFE050B; Mon, 11 Apr 2016 14:38:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Mon, 11 Apr 2016 14:38:37 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/13] ignite git commit: IGNITE-2725: Hadoop: fixed assertion in CancelJobProcessor caused by invalid phase transition. This closes #627. IGNITE-2725: Hadoop: fixed assertion in CancelJobProcessor caused by invalid phase transition. This closes #627. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4367d3d6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4367d3d6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4367d3d6 Branch: refs/heads/ignite-2004 Commit: 4367d3d6b84cbed9368667557a8535dbcc7e432d Parents: e5485f6 Author: iveselovskiy Authored: Mon Apr 11 13:02:02 2016 +0300 Committer: vozerov-gridgain Committed: Mon Apr 11 13:02:02 2016 +0300 ---------------------------------------------------------------------- .../processors/hadoop/jobtracker/HadoopJobTracker.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4367d3d6/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java index f4cf892..cdd8103 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java @@ -1581,7 +1581,10 @@ public class HadoopJobTracker extends HadoopComponent { /** {@inheritDoc} */ @Override protected void update(HadoopJobMetadata meta, HadoopJobMetadata cp) { - assert meta.phase() == PHASE_CANCELLING || err != null: "Invalid phase for cancel: " + meta; + final HadoopJobPhase currPhase = meta.phase(); + + assert currPhase == PHASE_CANCELLING || currPhase == PHASE_COMPLETE + || err != null: "Invalid phase for cancel: " + currPhase; Collection rdcCp = new HashSet<>(cp.pendingReducers()); @@ -1599,7 +1602,8 @@ public class HadoopJobTracker extends HadoopComponent { cp.pendingSplits(splitsCp); - cp.phase(PHASE_CANCELLING); + if (currPhase != PHASE_COMPLETE && currPhase != PHASE_CANCELLING) + cp.phase(PHASE_CANCELLING); if (err != null) cp.failCause(err);