You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/07/05 13:28:57 UTC
[1/2] airavata git commit: fixing issue in creating new process and
experiment outputs
Repository: airavata
Updated Branches:
refs/heads/develop c48982d75 -> d95546500
fixing issue in creating new process and experiment outputs
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6c2d7c5a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6c2d7c5a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6c2d7c5a
Branch: refs/heads/develop
Commit: 6c2d7c5ac717629767b8d1b69d705dd21a1bae49
Parents: 324a9f7
Author: scnakandala <su...@gmail.com>
Authored: Wed Jul 5 09:27:57 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jul 5 09:27:57 2017 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/impl/HPCRemoteCluster.java | 3 +++
.../airavata/gfac/impl/task/SCPDataStageTask.java | 14 +++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c2d7c5a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
index 65b4a1b..aba20c9 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HPCRemoteCluster.java
@@ -201,6 +201,7 @@ public class HPCRemoteCluster extends AbstractRemoteCluster{
* @param session
* @return
*/
+ //FIXME Find a better way to find wildcard file names
@Override
public List<String> getFileNameFromExtension(String fileRegex, String parentPath, Session session) throws GFacException {
try {
@@ -208,6 +209,8 @@ public class HPCRemoteCluster extends AbstractRemoteCluster{
List<String> matchingNames = new ArrayList<>();
for(String fileName : fileNames){
String tempFileName = fileName;
+
+ //FIXME Find better way to match wildcard file names
String[] splits = fileRegex.split("\\*");
boolean matching = true;
for(String split : splits){
http://git-wip-us.apache.org/repos/asf/airavata/blob/6c2d7c5a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
index eb902a5..418a453 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/SCPDataStageTask.java
@@ -47,6 +47,7 @@ import org.apache.airavata.model.status.TaskState;
import org.apache.airavata.model.status.TaskStatus;
import org.apache.airavata.model.task.DataStagingTaskModel;
import org.apache.airavata.model.task.TaskTypes;
+import org.apache.airavata.registry.cpi.ExpCatChildDataType;
import org.apache.airavata.registry.cpi.ExperimentCatalog;
import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
import org.apache.airavata.registry.cpi.RegistryException;
@@ -177,6 +178,8 @@ public class SCPDataStageTask implements Task {
String processId = processContext.getProcessId();
ProcessModel processModel = processContext.getProcessModel();
+ OutputDataObjectType processOutput = taskContext.getProcessOutput();
+
for(int i=0; i<fileNames.size(); i++){
String temp = fileNames.get(i);
if(temp != null && temp != ""){
@@ -190,15 +193,12 @@ public class SCPDataStageTask implements Task {
//Wildcard support is only enabled for output data staging
if (processState == ProcessState.OUTPUT_DATA_STAGING) {
- OutputDataObjectType outputDataObjectType = new OutputDataObjectType();
- outputDataObjectType.setName(fileName);
- experiment.addToExperimentOutputs(outputDataObjectType);
- processModel.addToProcessOutputs(outputDataObjectType);
+ processOutput.setName(fileName);
- experimentCatalog.update(ExperimentCatalogModelType.EXPERIMENT, experiment, experimentId);
- experimentCatalog.update(ExperimentCatalogModelType.PROCESS, processModel, processId);
+ experimentCatalog.add(ExpCatChildDataType.EXPERIMENT_OUTPUT, Arrays.asList(processOutput), experimentId);
+ experimentCatalog.add(ExpCatChildDataType.PROCESS_OUTPUT, Arrays.asList(processOutput), processId);
- taskContext.setProcessOutput(outputDataObjectType);
+ taskContext.setProcessOutput(processOutput);
makeDir(taskContext, destinationURI);
// TODO - save updated subtask model with new destination
[2/2] airavata git commit: merging origin
Posted by sc...@apache.org.
merging origin
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d9554650
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d9554650
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d9554650
Branch: refs/heads/develop
Commit: d95546500510ea670cba4376c5b7ee23875c6c9d
Parents: 6c2d7c5 c48982d
Author: scnakandala <su...@gmail.com>
Authored: Wed Jul 5 09:28:53 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jul 5 09:28:53 2017 -0400
----------------------------------------------------------------------
.../lib/Airavata/Model/Tenant/Types.php | 2 +
.../lib/Airavata/Model/Workspace/Types.php | 2 +
.../Profile/Tenant/CPI/TenantProfileService.php | 28 ++--
.../repositories/AbstractRepository.java | 18 +++
.../profile/commons/utils/QueryConstants.java | 4 +-
.../handlers/TenantProfileServiceHandler.java | 6 +-
.../tenant/cpi/TenantProfileService.java | 138 +++++++++----------
.../repositories/TenantProfileRepository.java | 8 +-
.../profile-tenant/profile-tenant-cpi.thrift | 2 +-
9 files changed, 115 insertions(+), 93 deletions(-)
----------------------------------------------------------------------