Repository: airavata Updated Branches: refs/heads/master 842004ee4 -> cf7290a28
adding max memory to batch queue Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cf7290a2 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cf7290a2 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cf7290a2 Branch: refs/heads/master Commit: cf7290a283318ddfe6abf3490d2e5a6bd07286b9 Parents: 842004e Author: Chathuri Wimalasena <[email protected]> Authored: Mon Dec 22 17:26:49 2014 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Mon Dec 22 17:26:49 2014 -0500 ---------------------------------------------------------------------- .../client/samples/RegisterSampleData.java | 30 ++++++++++---------- .../tools/RegisterOGCEUS3Application.java | 8 +++--- .../client/tools/RegisterUS3Application.java | 12 ++++---- .../catalog/data/model/BatchQueue.java | 15 ++++++++-- .../catalog/data/model/ComputeResource.java | 11 +++++++ .../data/resources/BatchQueueResource.java | 12 +++++++- .../data/resources/ComputeResourceResource.java | 10 +++++++ .../catalog/data/util/AppCatalogJPAUtils.java | 2 ++ .../data/util/AppCatalogThriftConversion.java | 4 +++ .../src/main/resources/appcatalog-derby.sql | 2 ++ .../src/main/resources/appcatalog-mysql.sql | 2 ++ 11 files changed, 80 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/cf7290a2/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java index 28f01f5..b00797c 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java @@ -125,25 +125,25 @@ public class RegisterSampleData { //Register Echo String echoAppDeployId = airavataClient.registerApplicationDeployment( RegisterSampleApplicationsUtils.createApplicationDeployment(echoModuleId, localhostId, - sampleScriptDir + "/echo.sh", ApplicationParallelismType.SERIAL, "Echo application description")); + sampleScriptDir + "/echo.sh", ApplicationParallelismType.SERIAL, "Echo application description", null)); System.out.println("Successfully registered Echo application on localhost, application Id = " + echoAppDeployId); //Register Add application String addAppDeployId = airavataClient.registerApplicationDeployment( RegisterSampleApplicationsUtils.createApplicationDeployment(addModuleId, localhostId, - sampleScriptDir + "/add.sh", ApplicationParallelismType.SERIAL, "Add application description")); + sampleScriptDir + "/add.sh", ApplicationParallelismType.SERIAL, "Add application description", null)); System.out.println("Successfully registered Add application on localhost, application Id = " + addAppDeployId); //Register Multiply application String multiplyAppDeployId = airavataClient.registerApplicationDeployment( RegisterSampleApplicationsUtils.createApplicationDeployment(multiplyModuleId, localhostId, - sampleScriptDir + "/multiply.sh", ApplicationParallelismType.SERIAL, "Multiply application description")); + sampleScriptDir + "/multiply.sh", ApplicationParallelismType.SERIAL, "Multiply application description", null)); System.out.println("Successfully registered Multiply application on localhost, application Id = " + multiplyAppDeployId); //Register Subtract application String subtractAppDeployId = airavataClient.registerApplicationDeployment( RegisterSampleApplicationsUtils.createApplicationDeployment(subtractModuleId, localhostId, - sampleScriptDir + "/subtract.sh", ApplicationParallelismType.SERIAL, "Subtract application description ")); + sampleScriptDir + "/subtract.sh", ApplicationParallelismType.SERIAL, "Subtract application description ", null)); System.out.println("Successfully registered Subtract application on localhost, application Id = " + subtractAppDeployId); } @@ -176,13 +176,13 @@ public class RegisterSampleData { appModules.add(echoModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo", "Hello World", - DataType.STRING, null, 1, false, "A test string to Echo", null); + DataType.STRING, null, 1, null, null, false, "A test string to Echo", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Echoed_Output", - "", DataType.STRING); + "", DataType.STRING, null, null); List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>(); applicationOutputs.add(output1); @@ -205,16 +205,16 @@ public class RegisterSampleData { appModules.add(addModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "2", - DataType.STRING, null, 1, false, "Add operation input_1", null); + DataType.STRING, null, 1, null, null, false, "Add operation input_1", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "3", - DataType.STRING, null, 2, false, "Add operation input_2", null); + DataType.STRING, null, 2, null, null, false, "Add operation input_2", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); applicationInputs.add(input2); OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Result", - "0", DataType.STRING); + "0", DataType.STRING, null, null); List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>(); applicationOutputs.add(output1); @@ -237,16 +237,16 @@ public class RegisterSampleData { appModules.add(multiplyModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "4", - DataType.STRING, null, 1, false, "Multiply operation input_1", null); + DataType.STRING, null, 1,null, null, false, "Multiply operation input_1", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "5", - DataType.STRING, null, 2, false, "Multiply operation input_2", null); + DataType.STRING, null, 2, null, null, false, "Multiply operation input_2", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); applicationInputs.add(input2); OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Result", - "0", DataType.STRING); + "0", DataType.STRING,null, null); List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>(); applicationOutputs.add(output1); @@ -269,16 +269,16 @@ public class RegisterSampleData { appModules.add(subtractModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "6", - DataType.STRING, null, 1, false, "Subtract operation input_1", null); + DataType.STRING, null, 1,null, null, false, "Subtract operation input_1", null); InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "7", - DataType.STRING, null, 2, false, "Subtract operation input_2", null); + DataType.STRING, null, 2,null, null, false, "Subtract operation input_2", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); applicationInputs.add(input2); OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Result", - "0", DataType.STRING); + "0", DataType.STRING, null, null); List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>(); applicationOutputs.add(output1); http://git-wip-us.apache.org/repos/asf/airavata/blob/cf7290a2/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java index 9ba0b4b..0a603d9 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java @@ -154,13 +154,13 @@ public class RegisterOGCEUS3Application { appModules.add(ultrascanModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("input", null, - DataType.URI, null, 1, false, "input tar file", null); + DataType.URI, null, 1,null, null, false, "input tar file", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("output", - "", DataType.URI); + "", DataType.URI, null, null); // OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("stdout", // "", DataType.URI); @@ -186,11 +186,11 @@ public class RegisterOGCEUS3Application { // Register Stampede String ultascanStamplede = airavataClient.registerApplicationDeployment(RegisterSampleApplicationsUtils.createApplicationDeployment(ultrascanModuleId, - stampedeResourceId, "/home1/01437/ogce/xsede_apps/ultrascan/bin/us_mpi_analysis", ApplicationParallelismType.MPI, "ultrascan OGCE application")); + stampedeResourceId, "/home1/01437/ogce/xsede_apps/ultrascan/bin/us_mpi_analysis", ApplicationParallelismType.MPI, "ultrascan OGCE application", null)); System.out.println("Ultrascan on stampede deployment Id " + ultascanStamplede); String ultascanTrestles = airavataClient.registerApplicationDeployment(RegisterSampleApplicationsUtils.createApplicationDeployment(ultrascanModuleId, - trestlesResourceId, "/home/ogce/xsede_app/ultrascan/bin/us_mpi_analysis", ApplicationParallelismType.MPI, "ultrascan OGCE application")); + trestlesResourceId, "/home/ogce/xsede_app/ultrascan/bin/us_mpi_analysis", ApplicationParallelismType.MPI, "ultrascan OGCE application", null)); System.out.println("Ultrascan on trestles deployment Id " + ultascanTrestles); // String ultascanLonestar = airavataClient.registerApplicationDeployment(RegisterSampleApplicationsUtils.createApplicationDeployment(ultrascanModuleId, // lonestarResourceId, "/home1/01623/us3/bin/us_mpi_analysis", ApplicationParallelismType.MPI, "ultrascan application")); http://git-wip-us.apache.org/repos/asf/airavata/blob/cf7290a2/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java index 0e86469..316daa3 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java @@ -154,13 +154,13 @@ public class RegisterUS3Application { appModules.add(ultrascanModuleId); InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("input", null, - DataType.URI, null, 1, false, "input tar file", null); + DataType.URI, null, 1,null, null, false, "input tar file", null); List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>(); applicationInputs.add(input1); OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("output", - "", DataType.URI); + "", DataType.URI, null, null); // OutputDataObjectType output2 = RegisterSampleApplicationsUtils.createAppOutput("stdout", // "", DataType.URI); @@ -186,17 +186,17 @@ public class RegisterUS3Application { // Register Stampede String ultascanStamplede = airavataClient.registerApplicationDeployment(RegisterSampleApplicationsUtils.createApplicationDeployment(ultrascanModuleId, - stampedeResourceId, "/home1/01623/us3/bin/us_mpi_analysis", ApplicationParallelismType.MPI, "ultrascan application")); + stampedeResourceId, "/home1/01623/us3/bin/us_mpi_analysis", ApplicationParallelismType.MPI, "ultrascan application", null)); System.out.println("Ultrascan on stampede deployment Id " + ultascanStamplede); String ultascanTrestles = airavataClient.registerApplicationDeployment(RegisterSampleApplicationsUtils.createApplicationDeployment(ultrascanModuleId, - trestlesResourceId, "/home/us3/trestles/bin/us_mpi_analysis", ApplicationParallelismType.MPI, "ultrascan application")); + trestlesResourceId, "/home/us3/trestles/bin/us_mpi_analysis", ApplicationParallelismType.MPI, "ultrascan application", null)); System.out.println("Ultrascan on trestles deployment Id " + ultascanTrestles); String ultascanLonestar = airavataClient.registerApplicationDeployment(RegisterSampleApplicationsUtils.createApplicationDeployment(ultrascanModuleId, - lonestarResourceId, "/home1/01623/us3/bin/us_mpi_analysis", ApplicationParallelismType.MPI, "ultrascan application")); + lonestarResourceId, "/home1/01623/us3/bin/us_mpi_analysis", ApplicationParallelismType.MPI, "ultrascan application", null)); System.out.println("Ultrascan on lonestar deployment Id " + ultascanLonestar); String ultascanAlamo = airavataClient.registerApplicationDeployment(RegisterSampleApplicationsUtils.createApplicationDeployment(ultrascanModuleId, - alamoResourceId, "/home/us3/bin/us_mpi_analysis.sh", ApplicationParallelismType.MPI, "ultrascan application")); + alamoResourceId, "/home/us3/bin/us_mpi_analysis.sh", ApplicationParallelismType.MPI, "ultrascan application", null)); System.out.println("Ultrascan on alamo deployment Id " + ultascanAlamo); } catch (Exception e) { e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/airavata/blob/cf7290a2/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/BatchQueue.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/BatchQueue.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/BatchQueue.java index 2deadfb..ac94b10 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/BatchQueue.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/BatchQueue.java @@ -66,8 +66,19 @@ public class BatchQueue implements Serializable { @Column(name = "MAX_NODES") private int maxNodes; - - public String getComputeResourceId() { + + @Column(name = "MAX_MEMORY") + private int maxMemory; + + public int getMaxMemory() { + return maxMemory; + } + + public void setMaxMemory(int maxMemory) { + this.maxMemory = maxMemory; + } + + public String getComputeResourceId() { return computeResourceId; } http://git-wip-us.apache.org/repos/asf/airavata/blob/cf7290a2/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ComputeResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ComputeResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ComputeResource.java index 2692a29..51141ec 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ComputeResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/ComputeResource.java @@ -46,6 +46,9 @@ public class ComputeResource implements Serializable { @Column(name = "HOST_NAME") private String hostName; + @Column(name = "MAX_MEMORY_NODE") + private int maxMemoryPerNode; + @Column(name = "CREATION_TIME") private Timestamp creationTime; @@ -91,4 +94,12 @@ public class ComputeResource implements Serializable { public void setHostName(String hostName) { this.hostName=hostName; } + + public int getMaxMemoryPerNode() { + return maxMemoryPerNode; + } + + public void setMaxMemoryPerNode(int maxMemoryPerNode) { + this.maxMemoryPerNode = maxMemoryPerNode; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/cf7290a2/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/BatchQueueResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/BatchQueueResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/BatchQueueResource.java index 2dac680..e7f5bff 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/BatchQueueResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/BatchQueueResource.java @@ -50,7 +50,8 @@ public class BatchQueueResource extends AbstractResource { private String queueName; private int maxProcessors; private int maxNodes; - + private int maxMemory; + @Override public void remove(Object identifier) throws AppCatalogException { HashMap<String, String> ids; @@ -233,6 +234,7 @@ public class BatchQueueResource extends AbstractResource { batchQueue.setQueueName(getQueueName()); batchQueue.setMaxProcessors(getMaxProcessors()); batchQueue.setMaxNodes(getMaxNodes()); + batchQueue.setMaxMemory(getMaxMemory()); if (existingBatchQueue == null) { em.persist(batchQueue); } else { @@ -344,4 +346,12 @@ public class BatchQueueResource extends AbstractResource { public void setMaxNodes(int maxNodes) { this.maxNodes=maxNodes; } + + public int getMaxMemory() { + return maxMemory; + } + + public void setMaxMemory(int maxMemory) { + this.maxMemory = maxMemory; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/cf7290a2/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java index 296debf..932713b 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/ComputeResourceResource.java @@ -44,6 +44,15 @@ public class ComputeResourceResource extends AbstractResource { private String hostName; private Timestamp createdTime; private Timestamp updatedTime; + private int maxMemoryPerNode; + + public int getMaxMemoryPerNode() { + return maxMemoryPerNode; + } + + public void setMaxMemoryPerNode(int maxMemoryPerNode) { + this.maxMemoryPerNode = maxMemoryPerNode; + } public Timestamp getCreatedTime() { return createdTime; @@ -274,6 +283,7 @@ public class ComputeResourceResource extends AbstractResource { computeResource.setResourceDescription(getResourceDescription()); computeResource.setResourceId(getResourceId()); computeResource.setHostName(getHostName()); + computeResource.setMaxMemoryPerNode(getMaxMemoryPerNode()); if (existingComputeResource == null) { em.persist(computeResource); } else { http://git-wip-us.apache.org/repos/asf/airavata/blob/cf7290a2/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 9d0cff1..6b99bd9 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 @@ -469,6 +469,7 @@ public class AppCatalogJPAUtils { batchQueueResource.setQueueName(o.getQueueName()); batchQueueResource.setMaxProcessors(o.getMaxProcessors()); batchQueueResource.setMaxNodes(o.getMaxNodes()); + batchQueueResource.setMaxMemory(o.getMaxMemory()); } return batchQueueResource; } @@ -479,6 +480,7 @@ public class AppCatalogJPAUtils { computeResourceResource.setResourceId(o.getResourceId()); computeResourceResource.setHostName(o.getHostName()); computeResourceResource.setCreatedTime(o.getCreationTime()); + computeResourceResource.setMaxMemoryPerNode(o.getMaxMemoryPerNode()); if (o.getUpdateTime() != null){ computeResourceResource.setUpdatedTime(o.getUpdateTime()); } http://git-wip-us.apache.org/repos/asf/airavata/blob/cf7290a2/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 1516b26..5cdd04a 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 @@ -41,6 +41,7 @@ public class AppCatalogThriftConversion { resource.setHostName(description.getHostName()); resource.setResourceDescription(description.getResourceDescription()); resource.setResourceId(description.getComputeResourceId()); + resource.setMaxMemoryPerNode(description.getMaxMemoryPerNode()); return resource; } @@ -49,6 +50,7 @@ public class AppCatalogThriftConversion { description.setComputeResourceId(resource.getResourceId()); description.setHostName(resource.getHostName()); description.setResourceDescription(resource.getResourceDescription()); + description.setMaxMemoryPerNode(resource.getMaxMemoryPerNode()); HostAliasResource aliasResource = new HostAliasResource(); List<Resource> resources = aliasResource.get(AbstractResource.HostAliasConstants.RESOURCE_ID, resource.getResourceId()); if (resources != null && !resources.isEmpty()){ @@ -176,6 +178,7 @@ public class AppCatalogThriftConversion { batchQueue.setMaxNodes(resource.getMaxNodes()); batchQueue.setMaxProcessors(resource.getMaxProcessors()); batchQueue.setMaxRunTime(resource.getMaxRuntime()); + batchQueue.setMaxMemory(resource.getMaxMemory()); batchQueue.setQueueDescription(resource.getQueueDescription()); batchQueue.setQueueName(resource.getQueueName()); return batchQueue; @@ -189,6 +192,7 @@ public class AppCatalogThriftConversion { batchQueue.setMaxRuntime(resource.getMaxRunTime()); batchQueue.setQueueDescription(resource.getQueueDescription()); batchQueue.setQueueName(resource.getQueueName()); + batchQueue.setMaxMemory(resource.getMaxMemory()); return batchQueue; } http://git-wip-us.apache.org/repos/asf/airavata/blob/cf7290a2/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 e4882d0..d576430 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 @@ -26,6 +26,7 @@ CREATE TABLE COMPUTE_RESOURCE RESOURCE_DESCRIPTION VARCHAR (255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', + MAX_MEMORY_NODE INTEGER, PRIMARY KEY (RESOURCE_ID) ); @@ -327,6 +328,7 @@ CREATE TABLE BATCH_QUEUE QUEUE_NAME VARCHAR(255) NOT NULL, MAX_PROCESSORS INTEGER, MAX_NODES INTEGER, + MAX_MEMORY INTEGER, PRIMARY KEY (COMPUTE_RESOURCE_ID,QUEUE_NAME), FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/cf7290a2/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql index 5c68bc9..a9889af 100644 --- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql +++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql @@ -25,6 +25,7 @@ CREATE TABLE COMPUTE_RESOURCE RESOURCE_DESCRIPTION VARCHAR (255), CREATION_TIME TIMESTAMP DEFAULT NOW(), UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ON UPDATE now(), + MAX_MEMORY_NODE INTEGER, PRIMARY KEY (RESOURCE_ID) ); @@ -312,6 +313,7 @@ CREATE TABLE BATCH_QUEUE QUEUE_NAME VARCHAR(255) NOT NULL, MAX_PROCESSORS INTEGER, MAX_NODES INTEGER, + MAX_MEMORY INTEGER, PRIMARY KEY (COMPUTE_RESOURCE_ID,QUEUE_NAME), FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE );
