You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2016/09/16 16:12:08 UTC
[33/48] airavata git commit: Added Fixed for reservations
Added Fixed for reservations
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ea4c2f67
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ea4c2f67
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ea4c2f67
Branch: refs/heads/lahiru/AIRAVATA-2065
Commit: ea4c2f67ccd08395f2829ee372bb53858a0a14dd
Parents: 2b3dec8
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Wed Aug 31 15:58:12 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Wed Aug 31 15:58:12 2016 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/gfac/core/GFacUtils.java | 5 ++++-
.../test/java/org/apache/airavata/gfac/core/GFacUtilsTest.java | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ea4c2f67/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 0ed836f..da5e8db 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -461,7 +461,10 @@ public class GFacUtils {
jobDescriptor.setNodes(totalNodeCount);
}
// qos per queue
- jobDescriptor.setQoS(getQoS(crp.getQualityOfService(), scheduling.getQueueName()));
+ String qoS = getQoS(crp.getQualityOfService(), scheduling.getQueueName());
+ if (qoS != null) {
+ jobDescriptor.setQoS(qoS);
+ }
if (totalCPUCount > 0) {
int ppn = totalCPUCount / totalNodeCount;
jobDescriptor.setProcessesPerNode(ppn);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ea4c2f67/modules/gfac/gfac-core/src/test/java/org/apache/airavata/gfac/core/GFacUtilsTest.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/gfac/core/GFacUtilsTest.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/gfac/core/GFacUtilsTest.java
index ecea66f..3262f86 100644
--- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/gfac/core/GFacUtilsTest.java
+++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/gfac/core/GFacUtilsTest.java
@@ -40,4 +40,10 @@ public class GFacUtilsTest {
}
+ @Test
+ public void testGetQoS_3() throws Exception {
+ String qos = "shared=oneweek";
+ String shared = GFacUtils.getQoS(qos, "compute");
+ Assert.assertNull(shared);
+ }
}
\ No newline at end of file