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 12A8B200B8C for ; Mon, 12 Sep 2016 22:14:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 111E8160AB8; Mon, 12 Sep 2016 20:14:31 +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 5998C160AB2 for ; Mon, 12 Sep 2016 22:14:30 +0200 (CEST) Received: (qmail 22085 invoked by uid 500); 12 Sep 2016 20:14:24 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 22076 invoked by uid 99); 12 Sep 2016 20:14: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; Mon, 12 Sep 2016 20:14:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59F1DE020A; Mon, 12 Sep 2016 20:14:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: update error model, AIRAVATA-2096 Date: Mon, 12 Sep 2016 20:14:24 +0000 (UTC) archived-at: Mon, 12 Sep 2016 20:14:31 -0000 Repository: airavata Updated Branches: refs/heads/hotfix-AIRAVATA-2096 2289aed1d -> 5dbf84cc1 update error model, AIRAVATA-2096 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5dbf84cc Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5dbf84cc Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5dbf84cc Branch: refs/heads/hotfix-AIRAVATA-2096 Commit: 5dbf84cc1a710b17b401f182ac2c4b904544d2c5 Parents: 2289aed Author: Shameera Rathnayaka Authored: Mon Sep 12 16:14:19 2016 -0400 Committer: Shameera Rathnayaka Committed: Mon Sep 12 16:14:19 2016 -0400 ---------------------------------------------------------------------- .../airavata/gfac/impl/GFacEngineImpl.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5dbf84cc/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java index 1d1391c..a57252e 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java @@ -74,6 +74,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; +import java.io.PrintWriter; +import java.io.StringWriter; import java.net.URI; import java.net.URISyntaxException; import java.util.*; @@ -207,14 +209,17 @@ public class GFacEngineImpl implements GFacEngine { return processContext; } catch (AppCatalogException e) { String msg = "App catalog access exception "; + saveErrorModel(processContext, e, msg); updateProcessFailure(processContext, msg); throw new GFacException(msg, e); } catch (RegistryException e) { String msg = "Registry access exception"; + saveErrorModel(processContext, e, msg); updateProcessFailure(processContext, msg); throw new GFacException(msg, e); } catch (AiravataException e) { String msg = "Remote cluster initialization error"; + saveErrorModel(processContext, e, msg); updateProcessFailure(processContext, msg); throw new GFacException(msg, e); } @@ -877,6 +882,20 @@ public class GFacEngineImpl implements GFacEngine { } } + private void saveErrorModel(ProcessContext pc, Exception e, String userFriendlyMsg){ + StringWriter errors = new StringWriter(); + e.printStackTrace(new PrintWriter(errors)); + ErrorModel errorModel = new ErrorModel(); + errorModel.setUserFriendlyMessage(userFriendlyMsg); + errorModel.setActualErrorMessage(errors.toString()); + errorModel.setCreationTime(AiravataUtils.getCurrentTimestamp().getTime()); + try { + GFacUtils.saveProcessError(pc, errorModel); + } catch (GFacException e1) { + log.error("Error while updating error model for process:" + pc.getProcessId()); + } + } + public static ResourceJobManager getResourceJobManager(ProcessContext processCtx) throws AppCatalogException, GFacException { List jobSubmissionInterfaces = Factory.getDefaultAppCatalog().getComputeResource() .getComputeResource(processCtx.getComputeResourceId()).getJobSubmissionInterfaces();