You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/09/08 22:25:41 UTC
airavata git commit: fixing bugs in process error saving
Repository: airavata
Updated Branches:
refs/heads/master d6315966e -> b86393ee4
fixing bugs in process error saving
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b86393ee
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b86393ee
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b86393ee
Branch: refs/heads/master
Commit: b86393ee414ad7b6a781d0173a474138873e2de6
Parents: d631596
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue Sep 8 16:25:36 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue Sep 8 16:25:36 2015 -0400
----------------------------------------------------------------------
.../catalog/impl/ExperimentRegistry.java | 18 +++++++++++++++---
.../catalog/resources/ProcessErrorResource.java | 1 +
.../catalog/resources/TaskErrorResource.java | 1 +
3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b86393ee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
index aa9a544..f90222b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
@@ -225,7 +225,11 @@ public class ExperimentRegistry {
public String addExperimentError(ErrorModel experimentError, String expId) throws RegistryException {
try {
ExperimentErrorResource error = new ExperimentErrorResource();
- error.setErrorId(getErrorID(expId));
+ if (experimentError.getErrorId() == null){
+ error.setErrorId(AiravataUtils.getId("EXP_ERROR"));
+ }else {
+ error.setErrorId(experimentError.getErrorId());
+ }
error.setExperimentId(expId);
error.setCreationTime(AiravataUtils.getTime(experimentError.getCreationTime()));
error.setActualErrorMessage(experimentError.getActualErrorMessage());
@@ -391,7 +395,11 @@ public class ExperimentRegistry {
try {
ProcessErrorResource error = new ProcessErrorResource();
error.setProcessId(processID);
- error.setErrorId(getErrorID(processID));
+ if (processError.getErrorId() == null){
+ error.setErrorId(AiravataUtils.getId("PROCESS_ERROR"));
+ }else {
+ error.setErrorId(processError.getErrorId());
+ }
error.setCreationTime(AiravataUtils.getTime(processError.getCreationTime()));
error.setActualErrorMessage(processError.getActualErrorMessage());
error.setUserFriendlyMessage(processError.getUserFriendlyMessage());
@@ -461,7 +469,11 @@ public class ExperimentRegistry {
try {
TaskErrorResource error = new TaskErrorResource();
error.setTaskId(taskId);
- error.setErrorId(getErrorID(taskId));
+ if (taskError.getErrorId() == null){
+ error.setErrorId(AiravataUtils.getId("TASK_ERROR"));
+ }else {
+ error.setErrorId(taskError.getErrorId());
+ }
error.setCreationTime(AiravataUtils.getTime(taskError.getCreationTime()));
error.setActualErrorMessage(taskError.getActualErrorMessage());
error.setUserFriendlyMessage(taskError.getUserFriendlyMessage());
http://git-wip-us.apache.org/repos/asf/airavata/blob/b86393ee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessErrorResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessErrorResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessErrorResource.java
index 05915b4..6a7f045 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessErrorResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessErrorResource.java
@@ -141,6 +141,7 @@ public class ProcessErrorResource extends AbstractExpCatResource {
processError = new ProcessError();
}
processError.setProcessId(processId);
+ processError.setErrorId(errorId);
processError.setActualErrorMessage(actualErrorMessage);
processError.setUserFriendlyMessage(userFriendlyMessage);
processError.setRootCauseErrorIdList(rootCauseErrorIdList);
http://git-wip-us.apache.org/repos/asf/airavata/blob/b86393ee/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskErrorResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskErrorResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskErrorResource.java
index 1ec0c45..9e01601 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskErrorResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskErrorResource.java
@@ -142,6 +142,7 @@ public class TaskErrorResource extends AbstractExpCatResource {
}
taskError.setTaskId(taskId);
+ taskError.setErrorId(errorId);
taskError.setActualErrorMessage(actualErrorMessage);
taskError.setUserFriendlyMessage(userFriendlyMessage);
taskError.setRootCauseErrorIdList(rootCauseErrorIdList);