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 8AE0F200BC0 for ; Tue, 15 Nov 2016 11:11:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8964D160B03; Tue, 15 Nov 2016 10:11:46 +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 D25AE160B02 for ; Tue, 15 Nov 2016 11:11:45 +0100 (CET) Received: (qmail 89734 invoked by uid 500); 15 Nov 2016 10:11:45 -0000 Mailing-List: contact commits-help@falcon.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.apache.org Delivered-To: mailing list commits@falcon.apache.org Received: (qmail 89725 invoked by uid 99); 15 Nov 2016 10:11:45 -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, 15 Nov 2016 10:11:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DE4ACE09B6; Tue, 15 Nov 2016 10:11:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pallavi@apache.org To: commits@falcon.apache.org Message-Id: <7667bf4d56194dc59067099189e2f8d8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: falcon git commit: FALCON-2177 Improve error message when entity suspend fails Date: Tue, 15 Nov 2016 10:11:44 +0000 (UTC) archived-at: Tue, 15 Nov 2016 10:11:46 -0000 Repository: falcon Updated Branches: refs/heads/master 54a88b814 -> df92d2b36 FALCON-2177 Improve error message when entity suspend fails Author: Pallavi Rao Reviewers: @praveen8927 Closes #294 from pallavi-rao/2177 and squashes the following commits: 3f00941 [Pallavi Rao] Revert "FALCON-1821 Update git pull merge script to accept and update JIRA type" 397a481 [Pallavi Rao] FALCON-2177 Improve error message when entity suspend fails be17164 [Pallavi Rao] Merge remote-tracking branch 'upstream/master' a6d8c6c [Pallavi Rao] FALCON-1821 Update git pull merge script to accept and update JIRA type Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/df92d2b3 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/df92d2b3 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/df92d2b3 Branch: refs/heads/master Commit: df92d2b364f96b4cc8e43ad35c8eb362a45afe8e Parents: 54a88b8 Author: Pallavi Rao Authored: Tue Nov 15 15:41:32 2016 +0530 Committer: Pallavi Rao Committed: Tue Nov 15 15:41:32 2016 +0530 ---------------------------------------------------------------------- .../apache/falcon/resource/AbstractSchedulableEntityManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/df92d2b3/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java index 3bdeb99..ef9cf69 100644 --- a/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java +++ b/prism/src/main/java/org/apache/falcon/resource/AbstractSchedulableEntityManager.java @@ -235,7 +235,8 @@ public abstract class AbstractSchedulableEntityManager extends AbstractInstanceM if (getWorkflowEngine(entityObj).isActive(entityObj)) { getWorkflowEngine(entityObj).suspend(entityObj); } else { - throw FalconWebException.newAPIException(entity + "(" + type + ") is not scheduled"); + throw FalconWebException.newAPIException("Status of " + entity + "(" + type + ") is " + + getStatusString(entityObj) + ". Only scheduled entities can be suspended."); } return new APIResult(APIResult.Status.SUCCEEDED, entity + "(" + type + ") suspended successfully"); } catch (Throwable e) {