Repository: airavata Updated Branches: refs/heads/master 843940fa0 -> c4861b09a
storage resource never set when populating process context Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c4861b09 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c4861b09 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c4861b09 Branch: refs/heads/master Commit: c4861b09aecd315436a4d5d10d72e6fdbb18ea4d Parents: 843940f Author: Chathuri Wimalasena <[email protected]> Authored: Fri Jan 8 22:29:31 2016 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri Jan 8 22:29:31 2016 -0500 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/impl/GFacEngineImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c4861b09/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java index f264e6c..f05c85d 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java @@ -42,6 +42,7 @@ import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDes import org.apache.airavata.model.appcatalog.computeresource.*; import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile; import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference; +import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription; import org.apache.airavata.model.application.io.DataType; import org.apache.airavata.model.application.io.InputDataObjectType; import org.apache.airavata.model.application.io.OutputDataObjectType; @@ -108,6 +109,16 @@ public class GFacEngineImpl implements GFacEngine { processContext.setComputeResourcePreference(appCatalog.getGatewayProfile().getComputeResourcePreference (gatewayId, processModel.getComputeResourceId())); StoragePreference storagePreference = appCatalog.getGatewayProfile().getStoragePreference(gatewayId, processModel.getStorageResourceId()); + StorageResourceDescription storageResource = appCatalog.getStorageResource().getStorageResource(processModel.getStorageResourceId()); + if (storageResource != null){ + processContext.setStorageResource(storageResource); + }else { + // we need to fail the process which will fail the experiment + processContext.setProcessStatus(new ProcessStatus(ProcessState.FAILED)); + GFacUtils.saveAndPublishProcessStatus(processContext); + throw new GFacException("expId: " + processModel.getExperimentId() + ", processId: " + processId + + ":- Couldn't find storage resource for storage resource id :" + processModel.getStorageResourceId()); + } if (storagePreference != null) { processContext.setStoragePreference(storagePreference); } else {
