You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/06/30 19:13:53 UTC
[1/2] git commit: updating db to incooperate node type
Repository: airavata
Updated Branches:
refs/heads/master f36f43a1b -> 98b738e91
updating db to incooperate node type
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/462b2417
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/462b2417
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/462b2417
Branch: refs/heads/master
Commit: 462b2417e20384df25a699d3d565a3b93ae838a6
Parents: 515eb10
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Mon Jun 30 13:13:14 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Mon Jun 30 13:13:14 2014 -0400
----------------------------------------------------------------------
.../model/util/ExperimentModelUtil.java | 8 +++
.../registry/jpa/impl/ExperimentRegistry.java | 4 ++
.../registry/jpa/model/WorkflowNodeDetail.java | 20 +++++++
.../registry/jpa/resources/Utils.java | 3 +
.../resources/WorkflowNodeDetailResource.java | 23 ++++++++
.../jpa/utils/ThriftDataModelConversion.java | 59 ++++++++++++++++++--
.../src/main/resources/registry-derby.sql | 2 +
.../src/main/resources/registry-mysql.sql | 2 +
8 files changed, 116 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/462b2417/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
index 265e8d5..2ac23f7 100644
--- a/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
+++ b/airavata-api/airavata-model-utils/src/main/java/org/apache/airavata/model/util/ExperimentModelUtil.java
@@ -24,11 +24,19 @@ package org.apache.airavata.model.util;
import org.apache.airavata.model.workspace.experiment.*;
+import java.util.Calendar;
import java.util.List;
public class ExperimentModelUtil {
+ public static WorkflowNodeStatus createWorkflowNodeStatus(WorkflowNodeState state){
+ WorkflowNodeStatus status = new WorkflowNodeStatus();
+ status.setWorkflowNodeState(state);
+ status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis());
+ return status;
+ }
+
public static Experiment createSimpleExperiment(String projectID,
String userName,
String experimentName,
http://git-wip-us.apache.org/repos/asf/airavata/blob/462b2417/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
index 5998f01..7ca3141 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
@@ -679,6 +679,8 @@ public class ExperimentRegistry {
WorkflowNodeDetailResource resource = (WorkflowNodeDetailResource) experiment.create(ResourceType.WORKFLOW_NODE_DETAIL);
resource.setExperimentResource(experiment);
resource.setNodeName(nodeDetails.getNodeName());
+ resource.setExecutionUnit(nodeDetails.getExecutionUnit().toString());
+ resource.setExecutionUnitData(nodeDetails.getExecutionUnitData());
resource.setCreationTime(AiravataUtils.getTime(nodeDetails.getCreationTime()));
resource.setNodeInstanceId(getNodeInstanceID(nodeDetails.getNodeName()));
resource.save();
@@ -734,6 +736,8 @@ public class ExperimentRegistry {
ExperimentResource experiment = (ExperimentResource) gatewayResource.create(ResourceType.EXPERIMENT);
WorkflowNodeDetailResource workflowNode = experiment.getWorkflowNode(nodeId);
workflowNode.setNodeName(nodeDetails.getNodeName());
+ workflowNode.setExecutionUnit(nodeDetails.getExecutionUnit().toString());
+ workflowNode.setExecutionUnitData(nodeDetails.getExecutionUnitData());
workflowNode.setCreationTime(AiravataUtils.getTime(nodeDetails.getCreationTime()));
workflowNode.setNodeInstanceId(nodeId);
workflowNode.save();
http://git-wip-us.apache.org/repos/asf/airavata/blob/462b2417/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/WorkflowNodeDetail.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/WorkflowNodeDetail.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/WorkflowNodeDetail.java
index 92a7691..46b7d6e 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/WorkflowNodeDetail.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/WorkflowNodeDetail.java
@@ -36,6 +36,10 @@ public class WorkflowNodeDetail implements Serializable {
@Id
@Column(name = "NODE_INSTANCE_ID")
private String nodeId;
+ @Column(name = "EXECUTION_UNIT")
+ private String executionUnit;
+ @Column(name = "EXECUTION_UNIT")
+ private String executionUnitData;
@Column(name = "CREATION_TIME")
private Timestamp creationTime;
@Column(name = "NODE_NAME")
@@ -84,4 +88,20 @@ public class WorkflowNodeDetail implements Serializable {
public void setExperiment(Experiment experiment) {
this.experiment = experiment;
}
+
+ public String getExecutionUnitData() {
+ return executionUnitData;
+ }
+
+ public void setExecutionUnitData(String executionUnitData) {
+ this.executionUnitData = executionUnitData;
+ }
+
+ public String getExecutionUnit() {
+ return executionUnit;
+ }
+
+ public void setExecutionUnit(String executionUnit) {
+ this.executionUnit = executionUnit;
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/462b2417/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
index 3b515d4..b46f8c4 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
@@ -623,6 +623,9 @@ public class Utils {
nodeDetailResource.setCreationTime(o.getCreationTime());
nodeDetailResource.setNodeInstanceId(o.getNodeId());
nodeDetailResource.setNodeName(o.getNodeName());
+ nodeDetailResource.setExecutionUnit(o.getExecutionUnit());
+ nodeDetailResource.setExecutionUnitData(o.getExecutionUnitData());
+
}
return nodeDetailResource;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/462b2417/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
index b47c4f3..9c05b17 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
@@ -43,6 +43,8 @@ public class WorkflowNodeDetailResource extends AbstractResource {
private String nodeInstanceId;
private Timestamp creationTime;
private String nodeName;
+ private String executionUnit;
+ private String executionUnitData;
public ExperimentResource getExperimentResource() {
return experimentResource;
@@ -350,11 +352,16 @@ public class WorkflowNodeDetailResource extends AbstractResource {
workflowNodeDetail.setExpId(experimentResource.getExpID());
workflowNodeDetail.setCreationTime(creationTime);
workflowNodeDetail.setNodeName(nodeName);
+ workflowNodeDetail.setExecutionUnit(getExecutionUnit());
+ workflowNodeDetail.setExecutionUnitData(getExecutionUnitData());
+
if (existingNode != null) {
existingNode.setExperiment(experiment);
existingNode.setExpId(experimentResource.getExpID());
existingNode.setCreationTime(creationTime);
existingNode.setNodeName(nodeName);
+ existingNode.setExecutionUnit(getExecutionUnit());
+ existingNode.setExecutionUnitData(getExecutionUnitData());
workflowNodeDetail = em.merge(existingNode);
} else {
em.persist(workflowNodeDetail);
@@ -446,4 +453,20 @@ public class WorkflowNodeDetailResource extends AbstractResource {
public TaskDetailResource getTaskDetail(String taskId) throws RegistryException{
return (TaskDetailResource)get(ResourceType.TASK_DETAIL, taskId);
}
+
+ public String getExecutionUnit() {
+ return executionUnit;
+ }
+
+ public void setExecutionUnit(String executionUnit) {
+ this.executionUnit = executionUnit;
+ }
+
+ public String getExecutionUnitData() {
+ return executionUnitData;
+ }
+
+ public void setExecutionUnitData(String executionUnitData) {
+ this.executionUnitData = executionUnitData;
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/462b2417/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
index 4a06d66..5085f4d 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/utils/ThriftDataModelConversion.java
@@ -21,17 +21,64 @@
package org.apache.airavata.persistance.registry.jpa.utils;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.model.workspace.experiment.*;
+import org.apache.airavata.model.workspace.experiment.ActionableGroup;
+import org.apache.airavata.model.workspace.experiment.AdvancedInputDataHandling;
+import org.apache.airavata.model.workspace.experiment.AdvancedOutputDataHandling;
+import org.apache.airavata.model.workspace.experiment.ApplicationStatus;
+import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling;
+import org.apache.airavata.model.workspace.experiment.CorrectiveAction;
+import org.apache.airavata.model.workspace.experiment.DataObjectType;
+import org.apache.airavata.model.workspace.experiment.DataTransferDetails;
+import org.apache.airavata.model.workspace.experiment.DataType;
+import org.apache.airavata.model.workspace.experiment.ErrorCategory;
+import org.apache.airavata.model.workspace.experiment.ErrorDetails;
+import org.apache.airavata.model.workspace.experiment.ExecutionUnit;
+import org.apache.airavata.model.workspace.experiment.Experiment;
+import org.apache.airavata.model.workspace.experiment.ExperimentState;
+import org.apache.airavata.model.workspace.experiment.ExperimentStatus;
+import org.apache.airavata.model.workspace.experiment.ExperimentSummary;
+import org.apache.airavata.model.workspace.experiment.JobDetails;
+import org.apache.airavata.model.workspace.experiment.JobState;
+import org.apache.airavata.model.workspace.experiment.JobStatus;
+import org.apache.airavata.model.workspace.experiment.QualityOfServiceParams;
+import org.apache.airavata.model.workspace.experiment.TaskDetails;
+import org.apache.airavata.model.workspace.experiment.TaskState;
+import org.apache.airavata.model.workspace.experiment.TaskStatus;
+import org.apache.airavata.model.workspace.experiment.TransferState;
+import org.apache.airavata.model.workspace.experiment.TransferStatus;
+import org.apache.airavata.model.workspace.experiment.UserConfigurationData;
+import org.apache.airavata.model.workspace.experiment.WorkflowNodeDetails;
+import org.apache.airavata.model.workspace.experiment.WorkflowNodeState;
+import org.apache.airavata.model.workspace.experiment.WorkflowNodeStatus;
import org.apache.airavata.persistance.registry.jpa.ResourceType;
-import org.apache.airavata.persistance.registry.jpa.resources.*;
+import org.apache.airavata.persistance.registry.jpa.resources.AdvanceInputDataHandlingResource;
+import org.apache.airavata.persistance.registry.jpa.resources.AdvancedOutputDataHandlingResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ApplicationInputResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ApplicationOutputResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ComputationSchedulingResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ConfigDataResource;
+import org.apache.airavata.persistance.registry.jpa.resources.DataTransferDetailResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ErrorDetailResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ExperimentInputResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ExperimentOutputResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ExperimentResource;
+import org.apache.airavata.persistance.registry.jpa.resources.JobDetailResource;
+import org.apache.airavata.persistance.registry.jpa.resources.NodeInputResource;
+import org.apache.airavata.persistance.registry.jpa.resources.NodeOutputResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ProjectResource;
+import org.apache.airavata.persistance.registry.jpa.resources.ProjectUserResource;
+import org.apache.airavata.persistance.registry.jpa.resources.QosParamResource;
+import org.apache.airavata.persistance.registry.jpa.resources.StatusResource;
+import org.apache.airavata.persistance.registry.jpa.resources.TaskDetailResource;
+import org.apache.airavata.persistance.registry.jpa.resources.WorkflowNodeDetailResource;
import org.apache.airavata.registry.cpi.RegistryException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.List;
-
public class ThriftDataModelConversion {
private final static Logger logger = LoggerFactory.getLogger(ThriftDataModelConversion.class);
@@ -352,6 +399,8 @@ public class ThriftDataModelConversion {
wfNode.setWorkflowNodeStatus(getWorkflowNodeStatus(nodeDetailResource.getWorkflowNodeStatus()));
List<ErrorDetailResource> errorDetails = nodeDetailResource.getErrorDetails();
wfNode.setErrors(getErrorDetailList(errorDetails));
+ wfNode.setExecutionUnit(ExecutionUnit.valueOf(nodeDetailResource.getExecutionUnit()));
+ wfNode.setExecutionUnitData(nodeDetailResource.getExecutionUnitData());
return wfNode;
}
return null;
http://git-wip-us.apache.org/repos/asf/airavata/blob/462b2417/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
index 780cd5b..3cd75c1 100644
--- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
+++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql
@@ -185,6 +185,8 @@ CREATE TABLE WORKFLOW_NODE_DETAIL
NODE_INSTANCE_ID VARCHAR(255),
CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
NODE_NAME VARCHAR(255) NOT NULL,
+ EXECUTION_UNIT VARCHAR(255) NOT NULL,
+ EXECUTION_UNIT_DATA VARCHAR(255),
PRIMARY KEY(NODE_INSTANCE_ID),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/462b2417/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
index 6353e01..68c0f7b 100644
--- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
+++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql
@@ -184,6 +184,8 @@ CREATE TABLE WORKFLOW_NODE_DETAIL
NODE_INSTANCE_ID VARCHAR(255),
CREATION_TIME TIMESTAMP DEFAULT NOW(),
NODE_NAME VARCHAR(255) NOT NULL,
+ EXECUTION_UNIT VARCHAR(255) NOT NULL,
+ EXECUTION_UNIT_DATA VARCHAR(255),
PRIMARY KEY(NODE_INSTANCE_ID),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sa...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/98b738e9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/98b738e9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/98b738e9
Branch: refs/heads/master
Commit: 98b738e9155b2b24a72477be8d3541cc66e1241e
Parents: 462b241 f36f43a
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Mon Jun 30 13:13:28 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Mon Jun 30 13:13:28 2014 -0400
----------------------------------------------------------------------
.../catalog/data/impl/ComputeResourceImpl.java | 178 ++++++++++++++-
.../data/resources/AbstractResource.java | 6 +-
.../resources/GSISSHSubmissionResource.java | 15 +-
.../resources/GlobusJobSubmissionResource.java | 48 +---
.../resources/GridFTPDataMovementResource.java | 28 +--
.../data/resources/SCPDataMovementResource.java | 14 +-
.../data/util/AppCatalogThriftConversion.java | 223 ++++++++++++++++++-
modules/distribution/server/pom.xml | 16 +-
.../airavata/gfac/core/utils/GFacUtils.java | 2 +-
.../security/TokenizedMyProxyAuthInfo.java | 3 +-
10 files changed, 408 insertions(+), 125 deletions(-)
----------------------------------------------------------------------