You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/09/12 20:49:19 UTC
[1/5] airavata git commit: [AIRAVATA-2058] Add a separate profile for
jenkins, until AIRAVATA-2057 is addressed and use that profile in jenkins
Repository: airavata
Updated Branches:
refs/heads/develop 9c02fe056 -> 875fc27d4
[AIRAVATA-2058] Add a separate profile for jenkins, until AIRAVATA-2057 is addressed and use that profile in jenkins
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/05ea66e1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/05ea66e1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/05ea66e1
Branch: refs/heads/develop
Commit: 05ea66e11e8098af51fc95151be596d96b8ccb8c
Parents: a94e0ef
Author: Lahiru Ginnaliya Gamathige <la...@apache.org>
Authored: Tue Aug 23 10:20:07 2016 -0700
Committer: Lahiru Ginnaliya Gamathige <la...@apache.org>
Committed: Tue Aug 23 10:20:07 2016 -0700
----------------------------------------------------------------------
pom.xml | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 97 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/05ea66e1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 71def09..33aebb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -568,9 +568,104 @@
<!--<module>modules/workflow-model</module>-->
<!--<module>modules/workflow</module>-->
<!--<module>modules/xbaya-gui</module>-->
- <module>distribution</module>
- </modules>
+ <module>distribution</module>
+ </modules>
</profile>
+ <profile>
+ <id>jenkins</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <!-- here the phase you need -->
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/assembly/dist</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ <skipTests>${skipTests}</skipTests>
+ <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
+ <!-- making sure that the sure-fire plugin doesn't run the integration
+ tests -->
+ <!-- Integration tests are run using the fail-safe plugin in the module
+ pom -->
+ <excludes>
+ <exclude>**/IT.java</exclude>
+ <exclude>**/*TestWithMyProxyAuth.java</exclude>
+ <exclude>**/*TestWithSSHAuth.java</exclude>
+ <exclude>**/*TestWithEC2Auth.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>modules/configuration</module>
+ <module>airavata-api</module>
+ <module>modules/commons</module>
+ <module>modules/messaging</module>
+ <module>modules/gfac</module>
+ <module>modules/registry</module>
+ <module>modules/security</module>
+ <module>modules/credential-store</module>
+ <module>modules/orchestrator</module>
+ <module>modules/monitoring</module>
+ <module>modules/user-profile</module>
+ <!--<module>modules/cloud</module>-->
+ <module>modules/server</module>
+ <module>modules/workflow</module>
+ <module>modules/test-suite</module>
+ <!-- Deprecated Modules-->
+ <!--<module>modules/integration-tests</module>-->
+ <!--<module>modules/workflow-model</module>-->
+ <!--<module>modules/workflow</module>-->
+ <!--<module>modules/xbaya-gui</module>-->
+ </modules>
+ </profile>
<profile>
<id>pedantic</id>
<build>
[4/5] airavata git commit: update experiment error model,
AIRAVATA-2096
Posted by sh...@apache.org.
update experiment 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/96e31a99
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/96e31a99
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/96e31a99
Branch: refs/heads/develop
Commit: 96e31a99f8f9b0b9b7be3826bc4e8d417c2e1c42
Parents: 5dbf84c
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Sep 12 16:38:46 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Sep 12 16:38:46 2016 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/96e31a99/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 a57252e..2b623e8 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
@@ -891,6 +891,7 @@ public class GFacEngineImpl implements GFacEngine {
errorModel.setCreationTime(AiravataUtils.getCurrentTimestamp().getTime());
try {
GFacUtils.saveProcessError(pc, errorModel);
+ GFacUtils.saveExperimentError(pc, errorModel);
} catch (GFacException e1) {
log.error("Error while updating error model for process:" + pc.getProcessId());
}
[3/5] airavata git commit: update error model, AIRAVATA-2096
Posted by sh...@apache.org.
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/develop
Commit: 5dbf84cc1a710b17b401f182ac2c4b904544d2c5
Parents: 2289aed
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Sep 12 16:14:19 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
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<JobSubmissionInterface> jobSubmissionInterfaces = Factory.getDefaultAppCatalog().getComputeResource()
.getComputeResource(processCtx.getComputeResourceId()).getJobSubmissionInterfaces();
[2/5] airavata git commit: fixed AIRAVATA-2096
Posted by sh...@apache.org.
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 <sh...@gmail.com>
Authored: Mon Sep 12 15:34:23 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
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<JobSubmissionInterface> 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");
[5/5] airavata git commit: merge hotfix
Posted by sh...@apache.org.
merge hotfix
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/875fc27d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/875fc27d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/875fc27d
Branch: refs/heads/develop
Commit: 875fc27d49ebfcd342f442dd75ca885b40b0a7ec
Parents: 9c02fe0 96e31a9
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Sep 12 16:49:10 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Sep 12 16:49:10 2016 -0400
----------------------------------------------------------------------
.../airavata/gfac/impl/GFacEngineImpl.java | 46 ++++++++++++++++++--
.../airavata/gfac/server/GfacServerHandler.java | 1 +
2 files changed, 43 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/875fc27d/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/875fc27d/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------