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 5C480200B8C for ; Mon, 12 Sep 2016 22:49:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5AE09160AD8; Mon, 12 Sep 2016 20:49:21 +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 AB705160AB8 for ; Mon, 12 Sep 2016 22:49:20 +0200 (CEST) Received: (qmail 30850 invoked by uid 500); 12 Sep 2016 20:49:19 -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 30819 invoked by uid 99); 12 Sep 2016 20:49:19 -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:49:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A9669E0551; Mon, 12 Sep 2016 20:49:19 +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 Date: Mon, 12 Sep 2016 20:49:20 -0000 Message-Id: In-Reply-To: <70c8e0b0483742c596520e6759d43872@git.apache.org> References: <70c8e0b0483742c596520e6759d43872@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] airavata git commit: fixed AIRAVATA-2096 archived-at: Mon, 12 Sep 2016 20:49:21 -0000 fixed AIRAVATA-2096 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2289aed1 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2289aed1 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2289aed1 Branch: refs/heads/develop Commit: 2289aed1d9c9b12c2ee9d5019f3001a5b281d9fa Parents: 05ea66e Author: Shameera Rathnayaka Authored: Mon Sep 12 15:34:23 2016 -0400 Committer: Shameera Rathnayaka Committed: Mon Sep 12 15:34:23 2016 -0400 ---------------------------------------------------------------------- .../airavata/gfac/impl/GFacEngineImpl.java | 26 +++++++++++++++++--- .../airavata/gfac/server/GfacServerHandler.java | 1 + 2 files changed, 23 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/2289aed1/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 f64e521..1d1391c 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 @@ -89,8 +89,8 @@ public class GFacEngineImpl implements GFacEngine { @Override public ProcessContext populateProcessContext(String processId, String gatewayId, String tokenId) throws GFacException { + ProcessContext processContext = new ProcessContext(processId, gatewayId, tokenId); try { - ProcessContext processContext = new ProcessContext(processId, gatewayId, tokenId); AppCatalog appCatalog = Factory.getDefaultAppCatalog(); processContext.setAppCatalog(appCatalog); ExperimentCatalog expCatalog = Factory.getDefaultExpCatalog(); @@ -206,12 +206,19 @@ public class GFacEngineImpl implements GFacEngine { } return processContext; } catch (AppCatalogException e) { - throw new GFacException("App catalog access exception ", e); + String msg = "App catalog access exception "; + updateProcessFailure(processContext, msg); + throw new GFacException(msg, e); } catch (RegistryException e) { - throw new GFacException("Registry access exception", e); + String msg = "Registry access exception"; + updateProcessFailure(processContext, msg); + throw new GFacException(msg, e); } catch (AiravataException e) { - throw new GFacException("Remote cluster initialization error", e); + String msg = "Remote cluster initialization error"; + updateProcessFailure(processContext, msg); + throw new GFacException(msg, e); } + } private void checkRecoveryWithCancel(ProcessContext processContext) throws Exception { @@ -859,6 +866,17 @@ public class GFacEngineImpl implements GFacEngine { }); } + private void updateProcessFailure(ProcessContext pc, String reason){ + ProcessStatus status = new ProcessStatus(ProcessState.FAILED); + status.setReason(reason); + pc.setProcessStatus(status); + try { + GFacUtils.saveAndPublishProcessStatus(pc); + } catch (GFacException e) { + log.error("Error while save and publishing process failed status event"); + } + } + public static ResourceJobManager getResourceJobManager(ProcessContext processCtx) throws AppCatalogException, GFacException { List jobSubmissionInterfaces = Factory.getDefaultAppCatalog().getComputeResource() .getComputeResource(processCtx.getComputeResourceId()).getJobSubmissionInterfaces(); http://git-wip-us.apache.org/repos/asf/airavata/blob/2289aed1/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java index c59e199..7366a19 100644 --- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java +++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java @@ -161,6 +161,7 @@ public class GfacServerHandler implements GfacService.Iface { executorService.execute(new GFacWorker(processId, gatewayId, tokenId)); } catch (GFacException e) { log.error("Failed to submit process", e); + return false; } catch (Exception e) { log.error("Error creating zookeeper nodes");