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/04/01 17:58:13 UTC
[1/2] airavata git commit: Add both stdout and stderr as failures
reason for job
Repository: airavata
Updated Branches:
refs/heads/develop 9b52485f7 -> cfee70c32
Add both stdout and stderr as failures reason for job
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7c30f789
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7c30f789
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7c30f789
Branch: refs/heads/develop
Commit: 7c30f789c59eaeb8b8a60615419f7964b722b695
Parents: 6c301e6
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Apr 1 11:57:42 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Apr 1 11:57:42 2016 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/impl/HPCRemoteCluster.java | 8 +++++++-
.../gfac/impl/task/DefaultJobSubmissionTask.java | 13 ++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7c30f789/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
index 2e5c3a7..677ba9b 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
@@ -94,10 +94,16 @@ public class HPCRemoteCluster extends AbstractRemoteCluster{
if (jsoutput.getJobId() == null) {
if (outputParser.isJobSubmissionFailed(reader.getStdOutputString())) {
jsoutput.setJobSubmissionFailed(true);
- jsoutput.setFailureReason(reader.getStdOutputString());
+ jsoutput.setFailureReason("stdout : " + reader.getStdOutputString() +
+ "\n stderr : " + reader.getStdErrorString());
}
}
jsoutput.setExitCode(reader.getExitCode());
+ if (jsoutput.getExitCode() != 0) {
+ jsoutput.setJobSubmissionFailed(true);
+ jsoutput.setFailureReason("stdout : " + reader.getStdOutputString() +
+ "\n stderr : " + reader.getStdErrorString());
+ }
jsoutput.setStdOut(reader.getStdOutputString());
jsoutput.setStdErr(reader.getStdErrorString());
return jsoutput;
http://git-wip-us.apache.org/repos/asf/airavata/blob/7c30f789/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
index 975602f..a4be386 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
@@ -103,27 +103,30 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
GFacUtils.saveProcessError(processContext, errorModel);
GFacUtils.saveTaskError(taskContext, errorModel);
taskStatus.setState(TaskState.FAILED);
- taskStatus.setReason("Job submission command exit with non zero exit code");
+ taskStatus.setReason("Job submission command didn't return a jobId");
taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
taskContext.setTaskStatus(taskStatus);
} else {
String msg;
GFacUtils.saveJobModel(processContext, jobModel);
+ ErrorModel errorModel = new ErrorModel();
if (exitCode != Integer.MIN_VALUE) {
msg = "expId:" + processContext.getProcessModel().getExperimentId() + ", processId:" +
processContext.getProcessId() + ", taskId: " + taskContext.getTaskId() +
" return non zero exit code:" + exitCode + " for JobName:" + jobModel.getJobName() +
- ", with failure reason : " + jobSubmissionOutput.getStdOut() + " Hence changing job state to Failed." ;
+ ", with failure reason : " + jobSubmissionOutput.getFailureReason()
+ + " Hence changing job state to Failed." ;
+ errorModel.setActualErrorMessage(jobSubmissionOutput.getFailureReason());
} else {
msg = "expId:" + processContext.getProcessModel().getExperimentId() + ", processId:" +
processContext.getProcessId() + ", taskId: " + taskContext.getTaskId() +
" doesn't return valid job submission exit code for JobName:" + jobModel.getJobName() +
- ", with failure reason : " + jobSubmissionOutput.getStdOut() + " Hence changing job state to Failed." ;
+ ", with failure reason : stdout ->" + jobSubmissionOutput.getStdOut() +
+ " stderr -> " + jobSubmissionOutput.getStdErr() + " Hence changing job state to Failed." ;
+ errorModel.setActualErrorMessage(msg);
}
log.error(msg);
- ErrorModel errorModel = new ErrorModel();
errorModel.setUserFriendlyMessage(msg);
- errorModel.setActualErrorMessage(msg);
GFacUtils.saveExperimentError(processContext, errorModel);
GFacUtils.saveProcessError(processContext, errorModel);
GFacUtils.saveTaskError(taskContext, errorModel);
[2/2] airavata git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata into develop
Posted by sh...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cfee70c3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cfee70c3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cfee70c3
Branch: refs/heads/develop
Commit: cfee70c32593407e330c44a8bb633cfa1dde4703
Parents: 7c30f78 9b52485
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Apr 1 11:58:00 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Apr 1 11:58:00 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../lib/airavata/scheduling_model_types.cpp | 66 ++++
.../lib/airavata/scheduling_model_types.h | 28 +-
.../lib/Airavata/Model/Scheduling/Types.php | 69 ++++
.../apache/airavata/model/scheduling/ttypes.py | 41 ++-
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../model/data/replica/DataProductModel.java | 2 +-
.../data/replica/DataReplicaLocationModel.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 328 ++++++++++++++++++-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../gfac/core/context/ProcessContext.java | 8 +-
.../org/apache/airavata/gfac/impl/Factory.java | 41 ++-
.../airavata/gfac/impl/GFacEngineImpl.java | 6 +-
.../core/utils/OrchestratorUtils.java | 34 ++
.../cpi/impl/SimpleOrchestratorImpl.java | 14 +-
.../catalog/model/ProcessResourceSchedule.java | 30 ++
.../catalog/model/UserConfigurationData.java | 30 ++
.../ProcessResourceScheduleResource.java | 30 ++
.../UserConfigurationDataResource.java | 60 +++-
.../experiment/catalog/resources/Utils.java | 6 +
.../utils/ThriftDataModelConversion.java | 9 +
.../src/main/resources/expcatalog-derby.sql | 3 +
.../src/main/resources/expcatalog-mysql.sql | 3 +
.../scheduling_model.thrift | 5 +-
101 files changed, 856 insertions(+), 119 deletions(-)
----------------------------------------------------------------------