Repository: airavata Updated Branches: refs/heads/master 5ba1bb7b3 -> b60c43e44
updating code to have the parallelism parameter Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b60c43e4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b60c43e4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b60c43e4 Branch: refs/heads/master Commit: b60c43e44ca2414f2305a1902cd1b1311680823d Parents: 5ba1bb7 Author: Saminda Wijeratne <[email protected]> Authored: Sun Jul 6 15:23:28 2014 -0400 Committer: Saminda Wijeratne <[email protected]> Committed: Sun Jul 6 15:23:28 2014 -0400 ---------------------------------------------------------------------- .../catalog/data/impl/ApplicationDeploymentImpl.java | 3 +++ .../catalog/data/model/ApplicationDeployment.java | 12 +++++++++++- .../catalog/data/resources/AbstractResource.java | 1 + .../catalog/data/resources/AppDeploymentResource.java | 11 +++++++++++ .../catalog/data/util/AppCatalogJPAUtils.java | 1 + .../catalog/data/util/AppCatalogThriftConversion.java | 2 ++ .../src/main/resources/appcatalog-derby.sql | 1 + 7 files changed, 30 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b60c43e4/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java index c598fd3..a31f0d3 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ApplicationDeploymentImpl.java @@ -60,6 +60,7 @@ public class ApplicationDeploymentImpl implements ApplicationDeployment { deploymentResource.setHostResource((ComputeResourceResource)computeHostResource.get(deploymentDescription.getComputeHostId())); deploymentResource.setAppDes(deploymentDescription.getAppDeploymentDescription()); deploymentResource.setExecutablePath(deploymentDescription.getExecutablePath()); + deploymentResource.setParallelism(deploymentDescription.getParallelism().toString()); //TODO // deploymentResource.setEnvModuleLoadCMD(deploymentDescription.getModuleLoadCmd()); deploymentResource.save(); @@ -128,7 +129,9 @@ public class ApplicationDeploymentImpl implements ApplicationDeployment { existingDep.setHostResource((ComputeResourceResource)computeHostResource.get(updatedDeployment.getComputeHostId())); existingDep.setAppDes(updatedDeployment.getAppDeploymentDescription()); existingDep.setExecutablePath(updatedDeployment.getExecutablePath()); + existingDep.setParallelism(updatedDeployment.getParallelism().toString()); //TODO + // existingDep.setEnvModuleLoadCMD(updatedDeployment.getModuleLoadCmd()); existingDep.save(); http://git-wip-us.apache.org/repos/asf/airavata/blob/b60c43e4/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationDeployment.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationDeployment.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationDeployment.java index 8e6cb1a..fe4d73d 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationDeployment.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ApplicationDeployment.java @@ -40,7 +40,9 @@ public class ApplicationDeployment implements Serializable { private String applicationDesc; @Column(name = "ENV_MODULE_LOAD_CMD") private String envModuleLoaString; - + @Column(name = "PARALLELISM") + private String parallelism; + @ManyToOne(cascade= CascadeType.MERGE) @JoinColumn(name = "APP_MODULE_ID") private ApplicationModule applicationModule; @@ -113,4 +115,12 @@ public class ApplicationDeployment implements Serializable { public void setComputeResource(ComputeResource computeResource) { this.computeResource = computeResource; } + + public String getParallelism() { + return parallelism; + } + + public void setParallelism(String parallelism) { + this.parallelism = parallelism; + } } http://git-wip-us.apache.org/repos/asf/airavata/blob/b60c43e4/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java index ba7788e..90f1788 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java @@ -171,6 +171,7 @@ public abstract class AbstractResource implements Resource { public static final String EXECUTABLE_PATH = "executablePath"; public static final String APPLICATION_DESC = "applicationDesc"; public static final String ENV_MODULE_LOAD_CMD = "envModuleLoaString"; + public static final String PARALLELISM = "parallelism"; } public final class LibraryPrepandPathConstants { http://git-wip-us.apache.org/repos/asf/airavata/blob/b60c43e4/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java index 0126b7b..da4bf2d 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppDeploymentResource.java @@ -43,6 +43,7 @@ public class AppDeploymentResource extends AbstractResource { private String appModuleId; private String hostId; private String executablePath; + private String parallelism; private String appDes; private String envModuleLoadCMD; private ComputeResourceResource hostResource; @@ -294,6 +295,7 @@ public class AppDeploymentResource extends AbstractResource { existingDeployment.setHostID(hostId); existingDeployment.setExecutablePath(executablePath); existingDeployment.setEnvModuleLoaString(envModuleLoadCMD); + existingDeployment.setParallelism(parallelism); em.merge(existingDeployment); }else { ApplicationDeployment deployment = new ApplicationDeployment(); @@ -305,6 +307,7 @@ public class AppDeploymentResource extends AbstractResource { deployment.setComputeResource(computeHost); deployment.setExecutablePath(executablePath); deployment.setEnvModuleLoaString(envModuleLoadCMD); + deployment.setParallelism(parallelism); em.persist(deployment); } em.getTransaction().commit(); @@ -343,4 +346,12 @@ public class AppDeploymentResource extends AbstractResource { } } } + + public String getParallelism() { + return parallelism; + } + + public void setParallelism(String parallelism) { + this.parallelism = parallelism; + } } http://git-wip-us.apache.org/repos/asf/airavata/blob/b60c43e4/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java index f20a312..d9e10f1 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java @@ -615,6 +615,7 @@ public class AppCatalogJPAUtils { resource.setEnvModuleLoadCMD(o.getEnvModuleLoaString()); resource.setHostId(o.getHostID()); resource.setExecutablePath(o.getExecutablePath()); + resource.setParallelism(o.getParallelism()); resource.setModuleResource((AppModuleResource) createApplicationModule(o.getApplicationModule())); resource.setHostResource((ComputeResourceResource) createComputeResource(o.getComputeResource())); return resource; http://git-wip-us.apache.org/repos/asf/airavata/blob/b60c43e4/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java index 2b50d08..553221f 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java @@ -62,6 +62,7 @@ import org.apache.aiaravata.application.catalog.data.resources.ScpDataMovementRe import org.apache.aiaravata.application.catalog.data.resources.SshJobSubmissionResource; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule; +import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType; import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths; import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription; import org.apache.airavata.model.appcatalog.appinterface.DataType; @@ -580,6 +581,7 @@ public class AppCatalogThriftConversion { description.setAppModuleId(resource.getAppModuleId()); description.setComputeHostId(resource.getHostId()); description.setExecutablePath(resource.getExecutablePath()); + description.setParallelism(ApplicationParallelismType.valueOf(resource.getParallelism())); description.setAppDeploymentDescription(resource.getAppDes()); //TODO ModuleLoadCmds is a list now. need to create a table for this and the jpa layer // description.setModuleLoadCmds(resource.getEnvModuleLoadCMD()); http://git-wip-us.apache.org/repos/asf/airavata/blob/b60c43e4/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql index 512e128..d8ce989 100644 --- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql +++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql @@ -207,6 +207,7 @@ CREATE TABLE APPLICATION_DEPLOYMENT APP_MODULE_ID VARCHAR(255), COMPUTE_HOSTID VARCHAR(255), EXECUTABLE_PATH VARCHAR(255), + PARALLELISM VARCHAR(255), APPLICATION_DESC VARCHAR(255), ENV_MODULE_LOAD_CMD VARCHAR(255), PRIMARY KEY(DEPLOYMENT_ID),
