Repository: falcon Updated Branches: refs/heads/master 54a88b814 -> df92d2b36
FALCON-2177 Improve error message when entity suspend fails Author: Pallavi Rao <[email protected]> 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 <[email protected]> Authored: Tue Nov 15 15:41:32 2016 +0530 Committer: Pallavi Rao <[email protected]> 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) {
