http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java index 533e719..8740737 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java @@ -386,13 +386,13 @@ public class ThriftDataModelConversion { if (errorModel != null){ List<ErrorModel> errorModels = new ArrayList<>(); errorModels.add(errorModel); - processModel.setProcessError(errorModels); + processModel.setProcessErrors(errorModels); } ProcessStatus processStatus = getProcessStatus(processResource.getProcessStatus()); if (processStatus != null){ List<ProcessStatus> statuses = new ArrayList<>(); statuses.add(processStatus); - processModel.setProcessStatus(statuses); + processModel.setProcessStatuses(statuses); } ComputationalResourceSchedulingModel schedule = getProcessResourceSchedule(processResource.getProcessResourceSchedule()); @@ -431,11 +431,15 @@ public class ThriftDataModelConversion { TaskStatus taskStatus = getTaskStatus(taskResource.getTaskStatus()); if (taskStatus != null){ - model.setTaskStatus(taskStatus); + List<TaskStatus> taskStatuses = new ArrayList<>(); + taskStatuses.add(taskStatus); + model.setTaskStatuses(taskStatuses); } ErrorModel errorModel = getErrorModel(taskResource.getTaskError()); if (errorModel != null) { - model.setTaskError(errorModel); + List<ErrorModel> errors = new ArrayList<>(); + errors.add(errorModel); + model.setTaskErrors(errors); } return model; @@ -453,7 +457,9 @@ public class ThriftDataModelConversion { model.setWorkingDir(jobResource.getWorkingDir()); JobStatus jobStatus = getJobStatus(jobResource.getJobStatus()); if (jobStatus != null){ - model.setJobStatus(jobStatus); + List<JobStatus> jobStatuses = new ArrayList<>(); + jobStatuses.add(jobStatus); + model.setJobStatuses(jobStatuses); } model.setExitCode(jobResource.getExitCode()); model.setStdOut(jobResource.getStdOut());
http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java index 67344d7..076208d 100644 --- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java +++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java @@ -720,7 +720,7 @@ public class RegistryServerHandler implements RegistryService.Iface { for (Object jobObject : jobs) { JobModel jobModel = (JobModel) jobObject; String jobID = jobModel.getJobId(); - JobStatus status = jobModel.getJobStatus(); + JobStatus status = jobModel.getJobStatuses().get(0); if (status != null){ jobStatus.put(jobID, status); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/thrift-interface-descriptions/data-models/experiment-catalog-models/job_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/job_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/job_model.thrift index f908c5e..9e7154e 100644 --- a/thrift-interface-descriptions/data-models/experiment-catalog-models/job_model.thrift +++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/job_model.thrift @@ -31,7 +31,7 @@ struct JobModel { 3: required string processId, 4: required string jobDescription, 5: optional i64 creationTime, - 6: optional status_models.JobStatus jobStatus, + 6: optional list<status_models.JobStatus> jobStatuses, 7: optional string computeResourceConsumed, 8: optional string jobName, 9: optional string workingDir, http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift index 0a72923..ac78837 100644 --- a/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift +++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/process_model.thrift @@ -44,7 +44,7 @@ struct ProcessModel { 2: required string experimentId, 3: optional i64 creationTime, 4: optional i64 lastUpdateTime, - 5: optional list<status_models.ProcessStatus> processStatus, + 5: optional list<status_models.ProcessStatus> processStatuses, 6: optional string processDetail, 7: optional string applicationInterfaceId, 8: optional string applicationDeploymentId, @@ -54,7 +54,7 @@ struct ProcessModel { 12: optional scheduling_model.ComputationalResourceSchedulingModel processResourceSchedule, 13: optional list<task_model.TaskModel> tasks, 14: optional string taskDag, - 15: optional list<airavata_commons.ErrorModel> processError, + 15: optional list<airavata_commons.ErrorModel> processErrors, 16: optional string gatewayExecutionId, 17: optional bool enableEmailNotification, 18: optional list<string> emailAddresses, http://git-wip-us.apache.org/repos/asf/airavata/blob/b46fd511/thrift-interface-descriptions/data-models/experiment-catalog-models/task_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/task_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/task_model.thrift index faaf93b..1d95d01 100644 --- a/thrift-interface-descriptions/data-models/experiment-catalog-models/task_model.thrift +++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/task_model.thrift @@ -58,10 +58,10 @@ struct TaskModel { 3: required string parentProcessId, 4: required i64 creationTime, 5: required i64 lastUpdateTime, - 6: required status_models.TaskStatus taskStatus, + 6: required list<status_models.TaskStatus> taskStatuses, 7: optional string taskDetail, 8: optional binary subTaskModel, - 9: optional airavata_commons.ErrorModel taskError, + 9: optional list<airavata_commons.ErrorModel> taskErrors, 10: optional list<job_model.JobModel> jobs }
