You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/08/31 19:58:32 UTC
[1/2] airavata git commit: Added Fixed for reservations
Repository: airavata
Updated Branches:
refs/heads/develop 6b9b4413d -> 729a15fa9
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/develop
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
[2/2] airavata git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata into develop
Posted by sh...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/729a15fa
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/729a15fa
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/729a15fa
Branch: refs/heads/develop
Commit: 729a15fa96a056381ce382aeed9c9e459e5511df
Parents: ea4c2f6 6b9b441
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Wed Aug 31 15:58:19 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Wed Aug 31 15:58:19 2016 -0400
----------------------------------------------------------------------
.../resources/lib/airavata/job_model_types.cpp | 86 +--
.../resources/lib/airavata/job_model_types.h | 4 +-
.../lib/airavata/process_model_types.cpp | 260 ++++++----
.../lib/airavata/process_model_types.h | 20 +-
.../resources/lib/airavata/task_model_types.cpp | 242 +++++----
.../resources/lib/airavata/task_model_types.h | 8 +-
.../lib/airavata/user_profile_model_types.cpp | 89 ++--
.../lib/airavata/user_profile_model_types.h | 7 +-
.../lib/Airavata/Model/Process/Types.php | 180 ++++---
.../resources/lib/Airavata/Model/Task/Types.php | 102 +++-
.../resources/lib/Airavata/Model/User/Types.php | 121 +++--
.../resources/lib/Airavata/Model/job/Types.php | 41 +-
.../lib/apache/airavata/model/job/ttypes.py | 20 +-
.../lib/apache/airavata/model/process/ttypes.py | 114 ++--
.../lib/apache/airavata/model/task/ttypes.py | 54 +-
.../lib/apache/airavata/model/user/ttypes.py | 117 +++--
.../org/apache/airavata/model/job/JobModel.java | 142 +++--
.../airavata/model/process/ProcessModel.java | 519 +++++++++++--------
.../apache/airavata/model/task/TaskModel.java | 302 +++++++----
.../apache/airavata/model/user/UserProfile.java | 24 +-
.../model/util/ExperimentModelUtil.java | 2 +-
.../apache/airavata/gfac/core/GFacUtils.java | 11 +-
.../gfac/core/context/ProcessContext.java | 21 +-
.../airavata/gfac/core/context/TaskContext.java | 17 +-
.../org/apache/airavata/gfac/impl/Factory.java | 4 +-
.../airavata/gfac/impl/GFacEngineImpl.java | 25 +-
.../airavata/gfac/impl/task/ArchiveTask.java | 5 +-
.../gfac/impl/task/BESJobSubmissionTask.java | 10 +-
.../airavata/gfac/impl/task/DataStageTask.java | 8 +-
.../gfac/impl/task/DataStreamingTask.java | 2 +-
.../impl/task/DefaultJobSubmissionTask.java | 26 +-
.../gfac/impl/task/EnvironmentSetupTask.java | 3 +-
.../gfac/impl/task/ForkJobSubmissionTask.java | 13 +-
.../gfac/impl/task/SCPDataStageTask.java | 16 +-
.../gfac/impl/task/utils/StreamData.java | 8 +-
.../task/utils/bes/ApplicationProcessor.java | 2 +-
.../impl/task/utils/bes/ResourceProcessor.java | 2 +-
.../gfac/monitor/email/EmailBasedMonitor.java | 4 +-
.../core/utils/OrchestratorUtils.java | 4 +-
.../validator/impl/BatchQueueValidator.java | 2 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 14 +-
.../server/OrchestratorServerHandler.java | 6 +-
.../org/apache/airavata/registry/core/Main.java | 75 ---
.../ComputeResourceSchedulingEntity.java | 2 +-
.../entities/expcatalog/ExperimentEntity.java | 35 +-
.../expcatalog/ExperimentErrorEntity.java | 4 +-
.../entities/expcatalog/ExperimentErrorPK.java | 75 +++
.../expcatalog/ExperimentInputEntity.java | 7 +-
.../entities/expcatalog/ExperimentInputPK.java | 74 +++
.../expcatalog/ExperimentOutputEntity.java | 24 +-
.../entities/expcatalog/ExperimentOutputPK.java | 74 +++
.../expcatalog/ExperimentStatusEntity.java | 83 +++
.../entities/expcatalog/ExperimentStatusPK.java | 74 +++
.../core/entities/expcatalog/JobEntity.java | 165 ++++++
.../entities/expcatalog/JobStatusEntity.java | 83 +++
.../core/entities/expcatalog/JobStatusPK.java | 74 +++
.../core/entities/expcatalog/ProcessEntity.java | 276 ++++++++++
.../entities/expcatalog/ProcessErrorEntity.java | 118 +++++
.../entities/expcatalog/ProcessErrorPK.java | 75 +++
.../entities/expcatalog/ProcessInputEntity.java | 174 +++++++
.../entities/expcatalog/ProcessInputPK.java | 74 +++
.../expcatalog/ProcessOutputEntity.java | 165 ++++++
.../entities/expcatalog/ProcessOutputPK.java | 70 +++
.../ProcessResourceSchedulingEntity.java | 170 ++++++
.../expcatalog/ProcessStatusEntity.java | 83 +++
.../entities/expcatalog/ProcessStatusPK.java | 74 +++
.../core/entities/expcatalog/TaskEntity.java | 147 ++++++
.../entities/expcatalog/TaskErrorEntity.java | 118 +++++
.../core/entities/expcatalog/TaskErrorPK.java | 75 +++
.../entities/expcatalog/TaskStatusEntity.java | 83 +++
.../core/entities/expcatalog/TaskStatusPK.java | 74 +++
.../expcatalog/UserConfigurationEntity.java | 2 +-
.../workspacecatalog/GatewayEntity.java | 2 +-
.../workspacecatalog/NSFDemographicsEntity.java | 2 +-
.../workspacecatalog/NotificationEntity.java | 2 +-
.../workspacecatalog/ProjectEntity.java | 2 +-
.../workspacecatalog/UserProfileEntity.java | 2 +-
.../expcatalog/ExperimentRepository.java | 101 ++++
.../expcatalog/ExperimentRespository.java | 43 --
.../src/main/resources/META-INF/persistence.xml | 17 +
.../src/main/resources/experiment_catalog.sql | 257 +++++++--
.../src/main/resources/workspace_catalog.sql | 48 +-
.../core/repositories/RepositoryTest.java | 40 ++
.../catalog/impl/ExperimentRegistry.java | 86 +--
.../utils/ThriftDataModelConversion.java | 22 +-
.../service/handler/RegistryServerHandler.java | 2 +-
.../experiment-catalog-models/job_model.thrift | 2 +-
.../process_model.thrift | 6 +-
.../experiment-catalog-models/task_model.thrift | 4 +-
.../user-group-models/user_profile_model.thrift | 35 +-
90 files changed, 4627 insertions(+), 1330 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/729a15fa/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------