http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-application-specific-handlers/src/main/java/org/apache/airavata/application/gaussian/handler/GaussianHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-application-specific-handlers/src/main/java/org/apache/airavata/application/gaussian/handler/GaussianHandler.java b/modules/gfac/gfac-application-specific-handlers/src/main/java/org/apache/airavata/application/gaussian/handler/GaussianHandler.java index 0d21665..74fef47 100644 --- a/modules/gfac/gfac-application-specific-handlers/src/main/java/org/apache/airavata/application/gaussian/handler/GaussianHandler.java +++ b/modules/gfac/gfac-application-specific-handlers/src/main/java/org/apache/airavata/application/gaussian/handler/GaussianHandler.java @@ -75,20 +75,20 @@ public class GaussianHandler extends AbstractHandler { ComputationalResourceScheduling taskScheduling = jobExecutionContext.getTaskData().getTaskScheduling(); for (Map.Entry<String, String> inputConfig : configurations.entrySet()) { if (inputConfig.getKey().equals(PROC_SHARED)) { - taskScheduling.setTotalCPUCount(Integer.parseInt(inputConfig.getValue())); + taskScheduling.setTotalCpuCount(Integer.parseInt(inputConfig.getValue())); } else if (inputConfig.getKey().equals(MEM)) { int userRequestedMem = Integer.parseInt(inputConfig.getValue()); int additionalMem = (int) (userRequestedMem * 0.2); // TODO check (userRequestedMem + additionalMem) > maxNode or Queue allowed Mem taskScheduling.setTotalPhysicalMemory(userRequestedMem + additionalMem); } else if (inputConfig.getKey().equals(PROC)) { - taskScheduling.setTotalCPUCount(Integer.parseInt(inputConfig.getValue())); + taskScheduling.setTotalCpuCount(Integer.parseInt(inputConfig.getValue())); } else { // TODO - handle other input configurations } logger.info("$$$$$$$$ " + inputConfig.getKey() + " --> " + inputConfig.getValue() + " $$$$$$$$$$$"); } - registry.update(RegistryModelType.TASK_DETAIL, jobExecutionContext.getTaskData(), jobExecutionContext.getTaskData().getTaskID()); + registry.update(RegistryModelType.TASK_DETAIL, jobExecutionContext.getTaskData(), jobExecutionContext.getTaskData().getTaskId()); } catch (IOException e) { throw new GFacHandlerException("Error while reading main input file ", e); } catch (RegistryException e) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java index dad2a4d..8b42abe 100644 --- a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java +++ b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/provider/impl/BESProvider.java @@ -20,24 +20,21 @@ */ package org.apache.airavata.gfac.bes.provider.impl; -import java.util.Calendar; -import java.util.Map; - +import de.fzj.unicore.bes.client.ActivityClient; +import de.fzj.unicore.bes.client.FactoryClient; +import de.fzj.unicore.bes.faults.UnknownActivityIdentifierFault; +import de.fzj.unicore.uas.client.StorageClient; +import de.fzj.unicore.wsrflite.xmlbeans.WSUtilities; +import eu.emi.security.authn.x509.impl.X500NameUtils; +import eu.unicore.util.httpclient.DefaultClientConfiguration; import org.airavata.appcatalog.cpi.AppCatalogException; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.bes.security.UNICORESecurityContext; import org.apache.airavata.gfac.bes.security.X509SecurityContext; -import org.apache.airavata.gfac.bes.utils.BESConstants; -import org.apache.airavata.gfac.bes.utils.DataTransferrer; -import org.apache.airavata.gfac.bes.utils.JSDLGenerator; -import org.apache.airavata.gfac.bes.utils.SecurityUtils; -import org.apache.airavata.gfac.bes.utils.StorageCreator; +import org.apache.airavata.gfac.bes.utils.*; import org.apache.airavata.gfac.core.context.JobExecutionContext; -import org.apache.airavata.gfac.core.monitor.MonitorID; import org.apache.airavata.gfac.core.notification.events.StartExecutionEvent; -import org.apache.airavata.gfac.core.notification.events.StatusChangeEvent; -import org.apache.airavata.gfac.core.notification.events.UnicoreJobIDEvent; import org.apache.airavata.gfac.core.provider.AbstractProvider; import org.apache.airavata.gfac.core.provider.GFacProvider; import org.apache.airavata.gfac.core.provider.GFacProviderException; @@ -51,26 +48,16 @@ import org.apache.airavata.model.workspace.experiment.JobDetails; import org.apache.airavata.model.workspace.experiment.JobState; import org.apache.xmlbeans.XmlCursor; import org.bouncycastle.asn1.x500.style.BCStyle; -import org.ggf.schemas.bes.x2006.x08.besFactory.ActivityStateEnumeration; +import org.ggf.schemas.bes.x2006.x08.besFactory.*; import org.ggf.schemas.bes.x2006.x08.besFactory.ActivityStateEnumeration.Enum; -import org.ggf.schemas.bes.x2006.x08.besFactory.ActivityStatusType; -import org.ggf.schemas.bes.x2006.x08.besFactory.CreateActivityDocument; -import org.ggf.schemas.bes.x2006.x08.besFactory.CreateActivityResponseDocument; -import org.ggf.schemas.bes.x2006.x08.besFactory.GetActivityStatusesDocument; -import org.ggf.schemas.bes.x2006.x08.besFactory.GetActivityStatusesResponseDocument; import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionDocument; import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3.x2005.x08.addressing.EndpointReferenceType; -import de.fzj.unicore.bes.client.ActivityClient; -import de.fzj.unicore.bes.client.FactoryClient; -import de.fzj.unicore.bes.faults.UnknownActivityIdentifierFault; -import de.fzj.unicore.uas.client.StorageClient; -import de.fzj.unicore.wsrflite.xmlbeans.WSUtilities; -import eu.emi.security.authn.x509.impl.X500NameUtils; -import eu.unicore.util.httpclient.DefaultClientConfiguration; +import java.util.Calendar; +import java.util.Map; public class BESProvider extends AbstractProvider implements GFacProvider, BESConstants { @@ -165,7 +152,7 @@ public class BESProvider extends AbstractProvider implements GFacProvider, .toString(); } log.info("JobID: " + jobId); - jobDetails.setJobID(jobId); + jobDetails.setJobId(jobId); jobDetails.setJobDescription(activityEpr.toString()); jobExecutionContext.setJobDetails(jobDetails); @@ -205,7 +192,7 @@ public class BESProvider extends AbstractProvider implements GFacProvider, sendNotification(jobExecutionContext,applicationJobStatus); GFacUtils.updateJobStatus(jobExecutionContext, jobDetails, applicationJobStatus); throw new GFacProviderException( - jobExecutionContext.getExperimentID() + "Job Canceled"); + jobExecutionContext.getExperimentId() + "Job Canceled"); } else if (activityStatus.getState() == ActivityStateEnumeration.FINISHED) { try { Thread.sleep(5000); @@ -448,10 +435,10 @@ public class BESProvider extends AbstractProvider implements GFacProvider, } private void sendNotification(JobExecutionContext jobExecutionContext, JobState status) { JobStatusChangeRequestEvent jobStatus = new JobStatusChangeRequestEvent(); - JobIdentifier jobIdentity = new JobIdentifier(jobExecutionContext.getJobDetails().getJobID(), - jobExecutionContext.getTaskData().getTaskID(), + JobIdentifier jobIdentity = new JobIdentifier(jobExecutionContext.getJobDetails().getJobId(), + jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); jobStatus.setJobIdentity(jobIdentity); jobStatus.setState(status); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/security/UNICORESecurityContext.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/security/UNICORESecurityContext.java b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/security/UNICORESecurityContext.java index f2ec94e..2b64bcc 100644 --- a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/security/UNICORESecurityContext.java +++ b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/security/UNICORESecurityContext.java @@ -21,11 +21,10 @@ package org.apache.airavata.gfac.bes.security; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Properties; -import java.util.Set; - +import eu.emi.security.authn.x509.X509Credential; +import eu.emi.security.authn.x509.impl.KeyAndCertCredential; +import eu.emi.security.authn.x509.impl.X500NameUtils; +import eu.unicore.util.httpclient.DefaultClientConfiguration; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.credential.store.store.CredentialReader; @@ -39,10 +38,10 @@ import org.bouncycastle.asn1.x500.style.BCStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.emi.security.authn.x509.X509Credential; -import eu.emi.security.authn.x509.impl.KeyAndCertCredential; -import eu.emi.security.authn.x509.impl.X500NameUtils; -import eu.unicore.util.httpclient.DefaultClientConfiguration; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Properties; +import java.util.Set; public class UNICORESecurityContext extends X509SecurityContext { @@ -88,7 +87,7 @@ public class UNICORESecurityContext extends X509SecurityContext { try{ boolean genCert = userData.isGenerateCert(); if(genCert) { - String userDN = userData.getUserDN(); + String userDN = userData.getUserDn(); if (userDN == null && "".equals(userDN)){ log.warn("Cannot generate cert, falling back to container configured MyProxy credentials"); return getDefaultConfiguration(enableMessageLogging); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/DataTransferrer.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/DataTransferrer.java b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/DataTransferrer.java index d70e4b1..746c8bf 100644 --- a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/DataTransferrer.java +++ b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/DataTransferrer.java @@ -231,7 +231,7 @@ public class DataTransferrer { // return outputDataDirectory; // } String outputDataDir = File.separator + "tmp"; - outputDataDir = outputDataDir + File.separator + jobContext.getExperimentID(); + outputDataDir = outputDataDir + File.separator + jobContext.getExperimentId(); (new File(outputDataDir)).mkdirs(); return outputDataDir; } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/JSDLUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/JSDLUtils.java b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/JSDLUtils.java index e7dc672..8cd0a4f 100644 --- a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/JSDLUtils.java +++ b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/JSDLUtils.java @@ -22,27 +22,10 @@ package org.apache.airavata.gfac.bes.utils; -import javax.xml.namespace.QName; - import org.apache.commons.httpclient.URIException; import org.apache.xmlbeans.XmlCursor; import org.apache.xmlbeans.XmlObject; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.ApplicationType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.BoundaryType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.CPUArchitectureType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.CandidateHostsType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.CreationFlagEnumeration; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.DataStagingType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.ExactType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDescriptionType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobIdentificationType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.OperatingSystemType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.OperatingSystemTypeEnumeration; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.OperatingSystemTypeType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.ProcessorArchitectureEnumeration; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.ResourcesType; -import org.ggf.schemas.jsdl.x2005.x11.jsdl.SourceTargetType; +import org.ggf.schemas.jsdl.x2005.x11.jsdl.*; import org.ggf.schemas.jsdl.x2005.x11.jsdlPosix.EnvironmentType; import org.ggf.schemas.jsdl.x2005.x11.jsdlPosix.POSIXApplicationDocument; import org.ggf.schemas.jsdl.x2005.x11.jsdlPosix.POSIXApplicationType; @@ -51,6 +34,8 @@ import org.ggf.schemas.jsdl.x2006.x07.jsdlHpcpa.HPCProfileApplicationType; import org.ogf.schemas.jsdl.x2007.x02.jsdlSpmd.SPMDApplicationDocument; import org.ogf.schemas.jsdl.x2007.x02.jsdlSpmd.SPMDApplicationType; +import javax.xml.namespace.QName; + /** * @@ -414,7 +399,7 @@ public class JSDLUtils - public static RangeValueType getTotalCPUCountRequirements(JobDefinitionType value) { + public static RangeValueType getTotalCpuCountRequirements(JobDefinitionType value) { if(value != null && value.getJobDescription() != null && value.getJobDescription().isSetResources() && value.getJobDescription().getResources().isSetTotalCPUCount()){ return toU6RangeValue(value.getJobDescription().getResources().getTotalCPUCount()); @@ -530,7 +515,7 @@ public class JSDLUtils } } - public static void setTotalCPUCountRequirements(JobDefinitionType value, RangeValueType cpuCount) { + public static void setTotalCpuCountRequirements(JobDefinitionType value, RangeValueType cpuCount) { org.ggf.schemas.jsdl.x2005.x11.jsdl.RangeValueType cpuTotalCount = getOrCreateTotalCPUCount(value); setRangeValue(cpuCount, cpuTotalCount); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/ResourceProcessor.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/ResourceProcessor.java b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/ResourceProcessor.java index cc3ad8b..984bd6c 100644 --- a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/ResourceProcessor.java +++ b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/ResourceProcessor.java @@ -56,7 +56,7 @@ public class ResourceProcessor { rangeType.setExact(crs.getNodeCount()); JSDLUtils.setTotalResourceCountRequirements(value, rangeType); // set totalcpu count to -1 as we dont need that - crs.setTotalCPUCount(0); + crs.setTotalCpuCount(0); } if(crs.getWallTimeLimit() > 0) { @@ -68,12 +68,12 @@ public class ResourceProcessor { JSDLUtils.setIndividualCPUTimeRequirements(value, cpuTime); } - if(crs.getTotalCPUCount() > 0) { + if(crs.getTotalCpuCount() > 0) { RangeValueType rangeType = new RangeValueType(); rangeType.setLowerBound(Double.NaN); rangeType.setUpperBound(Double.NaN); - rangeType.setExact(crs.getTotalCPUCount()); - JSDLUtils.setTotalCPUCountRequirements(value, rangeType); + rangeType.setExact(crs.getTotalCpuCount()); + JSDLUtils.setTotalCpuCountRequirements(value, rangeType); } } catch (NullPointerException npe) { http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java index 6a8dd5f..08e58db 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java @@ -201,11 +201,11 @@ public class JobExecutionContext extends AbstractContext implements Serializable } } - public String getExperimentID() { + public String getExperimentId() { return experimentID; } - public void setExperimentID(String experimentID) { + public void setExperimentId(String experimentID) { this.experimentID = experimentID; } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java index bf0e42e..3aa2c8d 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java @@ -36,7 +36,10 @@ import org.apache.airavata.gfac.Scheduler; import org.apache.airavata.gfac.core.context.ApplicationContext; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.context.MessageContext; -import org.apache.airavata.gfac.core.handler.*; +import org.apache.airavata.gfac.core.handler.GFacHandler; +import org.apache.airavata.gfac.core.handler.GFacHandlerConfig; +import org.apache.airavata.gfac.core.handler.GFacHandlerException; +import org.apache.airavata.gfac.core.handler.ThreadedHandler; import org.apache.airavata.gfac.core.monitor.MonitorID; import org.apache.airavata.gfac.core.monitor.state.GfacExperimentStateChangeRequest; import org.apache.airavata.gfac.core.notification.events.ExecutionFailEvent; @@ -62,7 +65,6 @@ import org.apache.airavata.registry.cpi.Registry; import org.apache.airavata.registry.cpi.RegistryException; import org.apache.airavata.registry.cpi.RegistryModelType; import org.apache.zookeeper.*; -import org.apache.zookeeper.data.Stat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; @@ -214,9 +216,9 @@ public class BetterGfacImpl implements GFac,Watcher { // task status will cause to update Experiment status. Remove this chained update approach and fix this correctly (update experiment status) if(jobExecutionContext!=null){ monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext), GfacExperimentState.FAILED)); - TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(), + TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); TaskStatusChangeRequestEvent event = new TaskStatusChangeRequestEvent(TaskState.FAILED, taskIdentity); monitorPublisher.publish(event); @@ -284,7 +286,7 @@ public class BetterGfacImpl implements GFac,Watcher { // setting experiment/task/workflownode related information Experiment experiment = (Experiment) registry.get(RegistryModelType.EXPERIMENT, experimentID); jobExecutionContext.setExperiment(experiment); - jobExecutionContext.setExperimentID(experimentID); + jobExecutionContext.setExperimentId(experimentID); jobExecutionContext.setWorkflowNodeDetails(experiment.getWorkflowNodeDetailsList().get(0)); jobExecutionContext.setTaskData(taskData); jobExecutionContext.setGatewayID(gatewayID); @@ -430,7 +432,7 @@ public class BetterGfacImpl implements GFac,Watcher { /** * Working dir */ - String workingDir = scratchLocation + File.separator + jobExecutionContext.getExperimentID(); + String workingDir = scratchLocation + File.separator + jobExecutionContext.getExperimentId(); jobExecutionContext.setWorkingDir(workingDir); /* @@ -498,7 +500,7 @@ public class BetterGfacImpl implements GFac,Watcher { } else if (isCompletedJob(gfacExpState)) { log.info("There is nothing to recover in this job so we do not re-submit"); ZKUtil.deleteRecursive(zk, - AiravataZKUtils.getExpZnodePath(jobExecutionContext.getExperimentID())); + AiravataZKUtils.getExpZnodePath(jobExecutionContext.getExperimentId())); } else { // Now we know this is an old Job, so we have to handle things gracefully log.info("Re-launching the job in GFac because this is re-submitted to GFac"); @@ -570,12 +572,12 @@ public class BetterGfacImpl implements GFac,Watcher { } }else if (gfacExpState == GfacExperimentState.INHANDLERSINVOKING || gfacExpState == GfacExperimentState.INHANDLERSINVOKED || gfacExpState == GfacExperimentState.OUTHANDLERSINVOKING){ log.info("Experiment should be immedietly cancelled"); - GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentID(), ExperimentState.CANCELED); + GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentId(), ExperimentState.CANCELED); } return true; }catch(Exception e){ - log.error("Error occured while cancelling job for experiment : " + jobExecutionContext.getExperimentID(), e); + log.error("Error occured while cancelling job for experiment : " + jobExecutionContext.getExperimentId(), e); throw new GFacException(e.getMessage(), e); }finally{ closeZK(jobExecutionContext); @@ -586,7 +588,7 @@ public class BetterGfacImpl implements GFac,Watcher { // Scheduler will decide the execution flow of handlers and provider // which handles // the job. - String experimentID = jobExecutionContext.getExperimentID(); + String experimentID = jobExecutionContext.getExperimentId(); try { Scheduler.schedule(jobExecutionContext); @@ -625,13 +627,13 @@ public class BetterGfacImpl implements GFac,Watcher { break; case OUTHANDLERSINVOKED: case COMPLETED: - GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentID(), ExperimentState.COMPLETED); + GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentId(), ExperimentState.COMPLETED); break; case FAILED: - GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentID(), ExperimentState.FAILED); + GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentId(), ExperimentState.FAILED); break; case UNKNOWN: - log.info("All output handlers are invoked successfully, ExperimentId: " + experimentID + " taskId: " + jobExecutionContext.getTaskData().getTaskID()); + log.info("All output handlers are invoked successfully, ExperimentId: " + experimentID + " taskId: " + jobExecutionContext.getTaskData().getTaskId()); break; default: throw new GFacException("Un-handled GfacExperimentState : " + state.name()); @@ -642,18 +644,18 @@ public class BetterGfacImpl implements GFac,Watcher { // we make the experiment as failed due to exception scenario monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext), GfacExperimentState.FAILED)); JobIdentifier jobIdentity = new JobIdentifier( - jobExecutionContext.getJobDetails().getJobID(), jobExecutionContext.getTaskData().getTaskID(), + jobExecutionContext.getJobDetails().getJobId(), jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); monitorPublisher.publish(new JobStatusChangeEvent(JobState.FAILED, jobIdentity)); GFacUtils.saveErrorDetails(jobExecutionContext, e.getCause().toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR ); } catch (NullPointerException e1) { log.error("Error occured during updating the statuses of Experiments,tasks or Job statuses to failed, " + "NullPointerException occurred because at this point there might not have Job Created", e1, e); - TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(), + TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); monitorPublisher.publish(new TaskStatusChangeEvent(TaskState.FAILED, taskIdentity)); GFacUtils.saveErrorDetails(jobExecutionContext, e.getCause().toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR ); @@ -699,7 +701,7 @@ public class BetterGfacImpl implements GFac,Watcher { return; // if the job is cancelled, status change is handled in cancel operation this thread simply has to be returned } // if (experimentID != null){ - // registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.INHANDLERSDONE); + // registry2.changeStatus(jobExecutionContext.getExperimentId(),AiravataJobState.State.INHANDLERSDONE); // } // After executing the in handlers provider instance should be set @@ -718,28 +720,28 @@ public class BetterGfacImpl implements GFac,Watcher { monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext), GfacExperimentState.FAILED)); // monitorPublisher.publish(new // ExperimentStatusChangedEvent(new - // ExperimentIdentity(jobExecutionContext.getExperimentID()), + // ExperimentIdentity(jobExecutionContext.getExperimentId()), // ExperimentState.FAILED)); // Updating the task status if there's any task associated // monitorPublisher.publish(new TaskStatusChangeRequest( - // new TaskIdentity(jobExecutionContext.getExperimentID(), + // new TaskIdentity(jobExecutionContext.getExperimentId(), // jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - // jobExecutionContext.getTaskData().getTaskID()), + // jobExecutionContext.getTaskData().getTaskId()), // TaskState.FAILED // )); JobIdentifier jobIdentity = new JobIdentifier( - jobExecutionContext.getJobDetails().getJobID(),jobExecutionContext.getTaskData().getTaskID(),jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - jobExecutionContext.getExperimentID(), + jobExecutionContext.getJobDetails().getJobId(),jobExecutionContext.getTaskData().getTaskId(),jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), + jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); monitorPublisher.publish(new JobStatusChangeEvent(JobState.FAILED, jobIdentity)); } catch (NullPointerException e1) { log.error("Error occured during updating the statuses of Experiments,tasks or Job statuses to failed, " + "NullPointerException occurred because at this point there might not have Job Created", e1, e); - //monitorPublisher.publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()), ExperimentState.FAILED)); + //monitorPublisher.publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentId()), ExperimentState.FAILED)); // Updating the task status if there's any task associated - TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(), + TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); monitorPublisher.publish(new TaskStatusChangeEvent(TaskState.FAILED, taskIdentity)); @@ -932,7 +934,7 @@ public class BetterGfacImpl implements GFac,Watcher { synchronized (mutex) { mutex.wait(5000); // waiting for the syncConnected event } - experimentPath = AiravataZKUtils.getExpZnodePath(jobExecutionContext.getExperimentID()); + experimentPath = AiravataZKUtils.getExpZnodePath(jobExecutionContext.getExperimentId()); if (jobExecutionContext.getZk().exists(experimentPath, false) == null) { log.error("Experiment is already finalized so no output handlers will be invoked"); return; @@ -953,8 +955,8 @@ public class BetterGfacImpl implements GFac,Watcher { handlers = jobExecutionContext.getGFacConfiguration().getOutHandlers(); } else { try { - jobExecutionContext = createJEC(jobExecutionContext.getExperimentID(), - jobExecutionContext.getTaskData().getTaskID(), jobExecutionContext.getGatewayID()); + jobExecutionContext = createJEC(jobExecutionContext.getExperimentId(), + jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getGatewayID()); } catch (Exception e) { log.error("Error constructing job execution context during outhandler invocation"); throw new GFacException(e); @@ -1016,12 +1018,12 @@ public class BetterGfacImpl implements GFac,Watcher { // At this point all the execution is finished so we update the task and experiment statuses. // Handler authors does not have to worry about updating experiment or task statuses. // monitorPublisher.publish(new -// ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()), +// ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentId()), // ExperimentState.COMPLETED)); // Updating the task status if there's any task associated - TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(), + TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); monitorPublisher.publish(new TaskStatusChangeEvent(TaskState.COMPLETED, taskIdentity)); monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext), GfacExperimentState.COMPLETED)); @@ -1101,8 +1103,8 @@ public class BetterGfacImpl implements GFac,Watcher { handlers = jobExecutionContext.getGFacConfiguration().getOutHandlers(); } else { try { - jobExecutionContext = createJEC(jobExecutionContext.getExperimentID(), - jobExecutionContext.getTaskData().getTaskID(), jobExecutionContext.getGatewayID()); + jobExecutionContext = createJEC(jobExecutionContext.getExperimentId(), + jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getGatewayID()); } catch (Exception e) { log.error("Error constructing job execution context during outhandler invocation"); throw new GFacException(e); @@ -1176,13 +1178,13 @@ public class BetterGfacImpl implements GFac,Watcher { // At this point all the execution is finished so we update the task and experiment statuses. // Handler authors does not have to worry about updating experiment or task statuses. // monitorPublisher.publish(new -// ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()), +// ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentId()), // ExperimentState.COMPLETED)); // Updating the task status if there's any task associated - TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(), + TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); monitorPublisher.publish(new TaskStatusChangeEvent(TaskState.COMPLETED, taskIdentity)); monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext), GfacExperimentState.COMPLETED)); @@ -1225,7 +1227,7 @@ public class BetterGfacImpl implements GFac,Watcher { public boolean isCancelled(JobExecutionContext executionContext){ // we should check whether experiment is cancelled using registry try { - ExperimentStatus status = (ExperimentStatus)registry.get(RegistryModelType.EXPERIMENT_STATUS, executionContext.getExperimentID()); + ExperimentStatus status = (ExperimentStatus)registry.get(RegistryModelType.EXPERIMENT_STATUS, executionContext.getExperimentId()); if (status != null){ ExperimentState experimentState = status.getExperimentState(); if (experimentState != null){ @@ -1243,7 +1245,7 @@ public class BetterGfacImpl implements GFac,Watcher { public boolean isCancelling(JobExecutionContext executionContext){ // check whether cancelling request came try { - ExperimentStatus status = (ExperimentStatus)registry.get(RegistryModelType.EXPERIMENT_STATUS, executionContext.getExperimentID()); + ExperimentStatus status = (ExperimentStatus)registry.get(RegistryModelType.EXPERIMENT_STATUS, executionContext.getExperimentId()); if (status != null){ ExperimentState experimentState = status.getExperimentState(); if (experimentState != null){ @@ -1260,7 +1262,7 @@ public class BetterGfacImpl implements GFac,Watcher { public boolean isCancel(JobExecutionContext jobExecutionContext) { try { - ExperimentStatus status = (ExperimentStatus) registry.get(RegistryModelType.EXPERIMENT_STATUS, jobExecutionContext.getExperimentID()); + ExperimentStatus status = (ExperimentStatus) registry.get(RegistryModelType.EXPERIMENT_STATUS, jobExecutionContext.getExperimentId()); if (status != null) { ExperimentState experimentState = status.getExperimentState(); if (experimentState != null) { http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java index c764b63..a08219e 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java @@ -264,7 +264,7 @@ // // setting experiment/task/workflownode related information // Experiment experiment = (Experiment) registry.get(RegistryModelType.EXPERIMENT, experimentID); // jobExecutionContext.setExperiment(experiment); -// jobExecutionContext.setExperimentID(experimentID); +// jobExecutionContext.setExperimentId(experimentID); // jobExecutionContext.setWorkflowNodeDetails(experiment.getWorkflowNodeDetailsList().get(0)); // jobExecutionContext.setTaskData(taskData); // @@ -339,18 +339,18 @@ // }catch (Exception e) { // try { // monitorPublisher.publish(new JobStatusChangeRequest(new MonitorID(jobExecutionContext), -// new JobIdentity(jobExecutionContext.getExperimentID(), +// new JobIdentity(jobExecutionContext.getExperimentId(), // jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), -// jobExecutionContext.getTaskData().getTaskID(), jobExecutionContext.getJobDetails().getJobID()), JobState.FAILED)); +// jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getJobDetails().getJobId()), JobState.FAILED)); // } catch (NullPointerException e1) { // log.error("Error occured during updating the statuses of Experiments,tasks or Job statuses to failed, " + // "NullPointerException occurred because at this point there might not have Job Created", e1, e); // // Updating status if job id is not set //// monitorPublisher -//// .publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()), ExperimentState.FAILED)); +//// .publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentId()), ExperimentState.FAILED)); // // Updating the task status if there's any task associated -// monitorPublisher.publish(new TaskStatusChangedEvent(new TaskIdentity(jobExecutionContext.getExperimentID(), jobExecutionContext -// .getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getTaskData().getTaskID()), TaskState.FAILED)); +// monitorPublisher.publish(new TaskStatusChangedEvent(new TaskIdentity(jobExecutionContext.getExperimentId(), jobExecutionContext +// .getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getTaskData().getTaskId()), TaskState.FAILED)); // // } // jobExecutionContext.setProperty(ERROR_SENT, "true"); @@ -363,14 +363,14 @@ // private void schedule(JobExecutionContext jobExecutionContext) throws GFacException { // // Scheduler will decide the execution flow of handlers and provider which handles // // the job. -// String experimentID = jobExecutionContext.getExperimentID(); +// String experimentID = jobExecutionContext.getExperimentId(); // try { // Scheduler.schedule(jobExecutionContext); // // // Executing in handlers in the order as they have configured in GFac configuration // invokeInFlowHandlers(jobExecutionContext); //// if (experimentID != null){ -//// registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.INHANDLERSDONE); +//// registry2.changeStatus(jobExecutionContext.getExperimentId(),AiravataJobState.State.INHANDLERSDONE); //// } //// }catch (ClassNotFoundException e) { //// log.error("Error loading the listener classes configured in airavata-server.properties",e); @@ -502,7 +502,7 @@ //// // setting experiment/task/workflownode related information //// Experiment experiment = (Experiment) registry.get(RegistryModelType.EXPERIMENT, experimentID); //// jobExecutionContext.setExperiment(experiment); -//// jobExecutionContext.setExperimentID(experimentID); +//// jobExecutionContext.setExperimentId(experimentID); //// jobExecutionContext.setWorkflowNodeDetails(experiment.getWorkflowNodeDetailsList().get(0)); //// jobExecutionContext.setTaskData(taskData); //// @@ -577,18 +577,18 @@ //// }catch (Exception e) { //// try { //// monitorPublisher.publish(new JobStatusChangeRequest(new MonitorID(jobExecutionContext), -//// new JobIdentity(jobExecutionContext.getExperimentID(), +//// new JobIdentity(jobExecutionContext.getExperimentId(), //// jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), -//// jobExecutionContext.getTaskData().getTaskID(), jobExecutionContext.getJobDetails().getJobID()), JobState.FAILED)); +//// jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getJobDetails().getJobId()), JobState.FAILED)); //// } catch (NullPointerException e1) { //// log.error("Error occured during updating the statuses of Experiments,tasks or Job statuses to failed, " + //// "NullPointerException occurred because at this point there might not have Job Created", e1, e); //// // Updating status if job id is not set ////// monitorPublisher -////// .publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()), ExperimentState.FAILED)); +////// .publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentId()), ExperimentState.FAILED)); //// // Updating the task status if there's any task associated -//// monitorPublisher.publish(new TaskStatusChangedEvent(new TaskIdentity(jobExecutionContext.getExperimentID(), jobExecutionContext -//// .getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getTaskData().getTaskID()), TaskState.FAILED)); +//// monitorPublisher.publish(new TaskStatusChangedEvent(new TaskIdentity(jobExecutionContext.getExperimentId(), jobExecutionContext +//// .getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getTaskData().getTaskId()), TaskState.FAILED)); //// //// } //// jobExecutionContext.setProperty(ERROR_SENT, "true"); @@ -601,14 +601,14 @@ //// private void schedule(JobExecutionContext jobExecutionContext) throws GFacException { //// // Scheduler will decide the execution flow of handlers and provider which handles //// // the job. -//// String experimentID = jobExecutionContext.getExperimentID(); +//// String experimentID = jobExecutionContext.getExperimentId(); //// try { //// Scheduler.schedule(jobExecutionContext); //// //// // Executing in handlers in the order as they have configured in GFac configuration //// invokeInFlowHandlers(jobExecutionContext); ////// if (experimentID != null){ -////// registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.INHANDLERSDONE); +////// registry2.changeStatus(jobExecutionContext.getExperimentId(),AiravataJobState.State.INHANDLERSDONE); ////// } //// //// // After executing the in handlers provider instance should be set to job execution context. @@ -625,18 +625,18 @@ //// } catch (Exception e) { //// try { //// monitorPublisher.publish(new JobStatusChangeRequest(new MonitorID(jobExecutionContext), -//// new JobIdentity(jobExecutionContext.getExperimentID(), +//// new JobIdentity(jobExecutionContext.getExperimentId(), //// jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), -//// jobExecutionContext.getTaskData().getTaskID(), jobExecutionContext.getJobDetails().getJobID()), JobState.FAILED)); +//// jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getJobDetails().getJobId()), JobState.FAILED)); //// } catch (NullPointerException e1) { //// log.error("Error occured during updating the statuses of Experiments,tasks or Job statuses to failed, " + //// "NullPointerException occurred because at this point there might not have Job Created", e1, e); //// // Updating status if job id is not set ////// monitorPublisher -////// .publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()), ExperimentState.FAILED)); +////// .publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentId()), ExperimentState.FAILED)); //// // Updating the task status if there's any task associated -//// monitorPublisher.publish(new TaskStatusChangedEvent(new TaskIdentity(jobExecutionContext.getExperimentID(), jobExecutionContext -//// .getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getTaskData().getTaskID()), TaskState.FAILED)); +//// monitorPublisher.publish(new TaskStatusChangedEvent(new TaskIdentity(jobExecutionContext.getExperimentId(), jobExecutionContext +//// .getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getTaskData().getTaskId()), TaskState.FAILED)); //// //// } //// jobExecutionContext.setProperty(ERROR_SENT, "true"); @@ -720,8 +720,8 @@ //// handlers = jobExecutionContext.getGFacConfiguration().getOutHandlers(); //// }else { //// try { -//// jobExecutionContext = createJEC(jobExecutionContext.getExperimentID(), -//// jobExecutionContext.getTaskData().getTaskID(), jobExecutionContext.getGatewayID()); +//// jobExecutionContext = createJEC(jobExecutionContext.getExperimentId(), +//// jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getGatewayID()); //// } catch (Exception e) { //// log.error("Error constructing job execution context during outhandler invocation"); //// throw new GFacException(e); @@ -757,13 +757,13 @@ //// // At this point all the execution is finished so we update the task and experiment statuses. //// // Handler authors does not have to worry about updating experiment or task statuses. ////// monitorPublisher.publish(new -////// ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()), +////// ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentId()), ////// ExperimentState.COMPLETED)); //// // Updating the task status if there's any task associated //// monitorPublisher.publish(new TaskStatusChangeRequest( -//// new TaskIdentity(jobExecutionContext.getExperimentID(), +//// new TaskIdentity(jobExecutionContext.getExperimentId(), //// jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), -//// jobExecutionContext.getTaskData().getTaskID()), TaskState.COMPLETED +//// jobExecutionContext.getTaskData().getTaskId()), TaskState.COMPLETED //// )); //// } //// http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractHandler.java index ee28c1d..242e658 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractHandler.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AbstractHandler.java @@ -78,9 +78,9 @@ public abstract class AbstractHandler implements GFacHandler { } protected void fireTaskOutputChangeEvent(JobExecutionContext jobExecutionContext, List<OutputDataObjectType> outputArray) { - TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(), + TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); publisher.publish(new TaskOutputChangeEvent(outputArray, taskIdentity)); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java index 0af8df0..b29081c 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/AiravataJobStatusUpdator.java @@ -98,7 +98,7 @@ public class AiravataJobStatusUpdator implements AbstractActivityListener { } status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis()); details.setJobStatus(status); - details.setJobID(jobID); + details.setJobId(jobID); logger.debug("Updating job status for "+jobID+":"+details.getJobStatus().toString()); airavataRegistry.update(RegistryModelType.JOB_STATUS, status, ids); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/ExperimentIdentity.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/ExperimentIdentity.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/ExperimentIdentity.java index dd1d9d8..9fdda87 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/ExperimentIdentity.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/ExperimentIdentity.java @@ -24,13 +24,13 @@ //public class ExperimentIdentity { // private String experimentID; // public ExperimentIdentity(String experimentId) { -// setExperimentID(experimentId); +// setExperimentId(experimentId); // } -// public String getExperimentID() { +// public String getExperimentId() { // return experimentID; // } // -// public void setExperimentID(String experimentID) { +// public void setExperimentId(String experimentID) { // this.experimentID = experimentID; // } //} http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/GfacInternalStatusUpdator.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/GfacInternalStatusUpdator.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/GfacInternalStatusUpdator.java index 836e2c6..e236c4a 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/GfacInternalStatusUpdator.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/GfacInternalStatusUpdator.java @@ -54,7 +54,7 @@ public class GfacInternalStatusUpdator implements AbstractActivityListener, Watc MonitorID monitorID = statusChangeRequest.getMonitorID(); String experimentNode = ServerSettings.getSetting(Constants.ZOOKEEPER_GFAC_EXPERIMENT_NODE, "/gfac-experiments"); String experimentPath = experimentNode + File.separator + ServerSettings.getSetting(Constants.ZOOKEEPER_GFAC_SERVER_NAME) - + File.separator + statusChangeRequest.getMonitorID().getExperimentID(); + + File.separator + statusChangeRequest.getMonitorID().getExperimentId(); Stat exists = null; if(!(GfacExperimentState.COMPLETED.equals(statusChangeRequest.getState()) || GfacExperimentState.FAILED.equals(statusChangeRequest.getState()))) { try { @@ -94,11 +94,11 @@ public class GfacInternalStatusUpdator implements AbstractActivityListener, Watc } switch (statusChangeRequest.getState()) { case COMPLETED: - logger.info("Experiment Completed, So removing the ZK entry for the experiment" + monitorID.getExperimentID()); + logger.info("Experiment Completed, So removing the ZK entry for the experiment" + monitorID.getExperimentId()); logger.info("Zookeeper experiment Path: " + experimentPath); break; case FAILED: - logger.info("Experiment Failed, So removing the ZK entry for the experiment" + monitorID.getExperimentID()); + logger.info("Experiment Failed, So removing the ZK entry for the experiment" + monitorID.getExperimentId()); logger.info("Zookeeper experiment Path: " + experimentPath); break; default: http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/MonitorID.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/MonitorID.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/MonitorID.java index aefe490..d1cb0e3 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/MonitorID.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/MonitorID.java @@ -69,9 +69,9 @@ public class MonitorID { this.computeResourceDescription = monitorID.getComputeResourceDescription(); this.jobStartedTime = new Timestamp((new Date()).getTime()); this.userName = monitorID.getUserName(); - this.jobID = monitorID.getJobID(); - this.taskID = monitorID.getTaskID(); - this.experimentID = monitorID.getExperimentID(); + this.jobID = monitorID.getJobId(); + this.taskID = monitorID.getTaskId(); + this.experimentID = monitorID.getExperimentId(); this.workflowNodeID = monitorID.getWorkflowNodeID(); this.jobName = monitorID.getJobName(); } @@ -90,12 +90,12 @@ public class MonitorID { this.jobExecutionContext = jobExecutionContext; this.computeResourceDescription = jobExecutionContext.getApplicationContext().getComputeResourceDescription(); userName = jobExecutionContext.getExperiment().getUserName(); - taskID = jobExecutionContext.getTaskData().getTaskID(); - experimentID = jobExecutionContext.getExperiment().getExperimentID(); + taskID = jobExecutionContext.getTaskData().getTaskId(); + experimentID = jobExecutionContext.getExperiment().getExperimentId(); workflowNodeID = jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId();// at this point we only have one node todo: fix this try { jobName = jobExecutionContext.getJobDetails().getJobName(); - jobID = jobExecutionContext.getJobDetails().getJobID(); + jobID = jobExecutionContext.getJobDetails().getJobId(); }catch(NullPointerException e){ logger.error("There is not job created at this point"); // this is not a big deal we create MonitorId before having a jobId or job Name @@ -126,11 +126,11 @@ public class MonitorID { this.userName = userName; } - public String getJobID() { + public String getJobId() { return jobID; } - public void setJobID(String jobID) { + public void setJobId(String jobID) { this.jobID = jobID; } @@ -158,19 +158,19 @@ public class MonitorID { this.parameters = parameters; } - public String getExperimentID() { + public String getExperimentId() { return experimentID; } - public void setExperimentID(String experimentID) { + public void setExperimentId(String experimentID) { this.experimentID = experimentID; } - public String getTaskID() { + public String getTaskId() { return taskID; } - public void setTaskID(String taskID) { + public void setTaskId(String taskID) { this.taskID = taskID; } @@ -192,11 +192,11 @@ public class MonitorID { // during that case job state comes as unknown.so we handle it here. if (this.state != null && status.equals(JobState.UNKNOWN)) { this.failedCount++; - logger.infoId(this.getJobID(), "{} status came for job {}, Increasing the failed count to: {}.", + logger.infoId(this.getJobId(), "{} status came for job {}, Increasing the failed count to: {}.", status.toString(), this.jobID, this.failedCount); }else { // normal scenario - logger.infoId(this.getJobID(), "Valid status {} came for job {}, resetting fail count to 0", status.toString(), this.jobID); + logger.infoId(this.getJobId(), "Valid status {} came for job {}, resetting fail count to 0", status.toString(), this.jobID); setFailedCount(0); this.state = status; } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/GfacExperimentStateChangeRequest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/GfacExperimentStateChangeRequest.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/GfacExperimentStateChangeRequest.java index 545bcd3..3eb4707 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/GfacExperimentStateChangeRequest.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/GfacExperimentStateChangeRequest.java @@ -32,10 +32,10 @@ public class GfacExperimentStateChangeRequest { private MonitorID monitorID; public GfacExperimentStateChangeRequest(MonitorID monitorID, GfacExperimentState state) { - setIdentity(new JobIdentifier(monitorID.getJobID(), - monitorID.getTaskID(), + setIdentity(new JobIdentifier(monitorID.getJobId(), + monitorID.getTaskId(), monitorID.getWorkflowNodeID(), - monitorID.getExperimentID(), + monitorID.getExperimentId(), monitorID.getJobExecutionContext().getGatewayID())); setMonitorID(monitorID); this.state = state; http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/JobStatusChangeRequest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/JobStatusChangeRequest.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/JobStatusChangeRequest.java index 2530ff8..093325d 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/JobStatusChangeRequest.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/JobStatusChangeRequest.java @@ -43,8 +43,8 @@ // } // // public JobStatusChangeRequest(MonitorID monitorID) { -// setIdentity(new JobIdentity(monitorID.getExperimentID(),monitorID.getWorkflowNodeID(), -// monitorID.getTaskID(),monitorID.getJobID())); +// setIdentity(new JobIdentity(monitorID.getExperimentId(),monitorID.getWorkflowNodeID(), +// monitorID.getTaskId(),monitorID.getJobId())); // setMonitorID(monitorID); // this.state = monitorID.getStatus(); // } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/JobStatusChangedEvent.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/JobStatusChangedEvent.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/JobStatusChangedEvent.java index b5ccf1c..cc1e245 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/JobStatusChangedEvent.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/monitor/state/JobStatusChangedEvent.java @@ -43,8 +43,8 @@ // } // // public JobStatusChangedEvent(MonitorID monitorID) { -// setIdentity(new JobIdentity(monitorID.getExperimentID(),monitorID.getWorkflowNodeID(), -// monitorID.getTaskID(),monitorID.getJobID())); +// setIdentity(new JobIdentity(monitorID.getExperimentId(),monitorID.getWorkflowNodeID(), +// monitorID.getTaskId(),monitorID.getJobId())); // setMonitorID(monitorID); // this.state = monitorID.getStatus(); // } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java index 0810bfd..2c6cbd4 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/GFacUtils.java @@ -202,9 +202,9 @@ public class GFacUtils { details.setJobStatus(status); registry.add(ChildDataType.JOB_DETAIL, details, new CompositeIdentifier(jobExecutionContext.getTaskData() - .getTaskID(), details.getJobID())); - JobIdentifier identifier = new JobIdentifier(details.getJobID(), jobExecutionContext.getTaskData().getTaskID(), - jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getExperimentID(), + .getTaskId(), details.getJobId())); + JobIdentifier identifier = new JobIdentifier(details.getJobId(), jobExecutionContext.getTaskData().getTaskId(), + jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); JobStatusChangeRequestEvent jobStatusChangeRequestEvent = new JobStatusChangeRequestEvent(state, identifier); monitorPublisher.publish(jobStatusChangeRequestEvent); @@ -225,7 +225,7 @@ public class GFacUtils { details.setJobStatus(status); registry.update( org.apache.airavata.registry.cpi.RegistryModelType.JOB_DETAIL, - details, details.getJobID()); + details, details.getJobId()); } catch (Exception e) { throw new GFacException("Error persisting job status" + e.getLocalizedMessage(), e); @@ -245,7 +245,7 @@ public class GFacUtils { details.setCreationTime(Calendar.getInstance().getTimeInMillis()); details.setErrorCategory(errorCatogory); registry.add(ChildDataType.ERROR_DETAIL, details, - jobExecutionContext.getTaskData().getTaskID()); + jobExecutionContext.getTaskData().getTaskId()); } catch (Exception e) { throw new GFacException("Error persisting job status" + e.getLocalizedMessage(), e); @@ -273,7 +273,7 @@ public class GFacUtils { throws ApplicationSettingsException, KeeperException, InterruptedException { String expState = AiravataZKUtils.getExpState(zk, jobExecutionContext - .getExperimentID()); + .getExperimentId()); if (expState == null || expState.isEmpty()) { return GfacExperimentState.UNKNOWN; } @@ -285,7 +285,7 @@ public class GFacUtils { throws ApplicationSettingsException, KeeperException, InterruptedException { String expState = AiravataZKUtils.getExpState(zk, jobExecutionContext - .getExperimentID()); + .getExperimentId()); if (expState == null) { return -1; } @@ -306,7 +306,7 @@ public class GFacUtils { throws ApplicationSettingsException, KeeperException, InterruptedException { String expState = AiravataZKUtils.getExpZnodeHandlerPath( - jobExecutionContext.getExperimentID(), className); + jobExecutionContext.getExperimentId(), className); Stat exists = zk.exists(expState, false); if (exists == null) { zk.create(expState, new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, @@ -342,7 +342,7 @@ public class GFacUtils { GfacHandlerState state) throws ApplicationSettingsException, KeeperException, InterruptedException { String expState = AiravataZKUtils.getExpZnodeHandlerPath( - jobExecutionContext.getExperimentID(), className); + jobExecutionContext.getExperimentId(), className); Stat exists = zk.exists(expState, false); if (exists == null) { zk.create(expState, new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, @@ -379,7 +379,7 @@ public class GFacUtils { KeeperException, InterruptedException { if(zk.getState().isConnected()) { String expState = AiravataZKUtils.getExpZnodeHandlerPath( - jobExecutionContext.getExperimentID(), className); + jobExecutionContext.getExperimentId(), className); Stat exists = zk.exists(expState + File.separator + AiravataZKUtils.ZK_EXPERIMENT_STATE_NODE, false); @@ -400,7 +400,7 @@ public class GFacUtils { JobExecutionContext jobExecutionContext, String className) { try { String expState = AiravataZKUtils.getExpZnodeHandlerPath( - jobExecutionContext.getExperimentID(), className); + jobExecutionContext.getExperimentId(), className); Stat exists = zk.exists(expState + File.separator + AiravataZKUtils.ZK_EXPERIMENT_STATE_NODE, false); @@ -595,7 +595,7 @@ public class GFacUtils { if (zk != null) { String expZnodeHandlerPath = AiravataZKUtils .getExpZnodeHandlerPath( - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), className); Stat exists = zk.exists(expZnodeHandlerPath, false); if (exists != null) { @@ -617,7 +617,7 @@ public class GFacUtils { if (zk != null) { String expZnodeHandlerPath = AiravataZKUtils .getExpZnodeHandlerPath( - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), className); Stat exists = zk.exists(expZnodeHandlerPath, false); return new String(jobExecutionContext.getZk().getData( @@ -739,7 +739,7 @@ public class GFacUtils { Experiment details = (Experiment) airavataRegistry.get(RegistryModelType.EXPERIMENT, experimentId); if (details == null) { details = new Experiment(); - details.setExperimentID(experimentId); + details.setExperimentId(experimentId); } org.apache.airavata.model.workspace.experiment.ExperimentStatus status = new org.apache.airavata.model.workspace.experiment.ExperimentStatus(); status.setExperimentState(state); @@ -783,9 +783,9 @@ public class GFacUtils { } public static void publishTaskStatus (JobExecutionContext jobExecutionContext, MonitorPublisher publisher, TaskState state){ - TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(), + TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); publisher.publish(new TaskStatusChangeRequestEvent(state, taskIdentity)); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutHandlerWorker.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutHandlerWorker.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutHandlerWorker.java index f992f10..a864029 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutHandlerWorker.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutHandlerWorker.java @@ -66,7 +66,7 @@ public class OutHandlerWorker implements Runnable { gfac.invokeOutFlowHandlers(jEC); } catch (Exception e) { logger.error(e.getMessage(),e); - TaskIdentifier taskIdentifier = new TaskIdentifier(monitorID.getTaskID(), monitorID.getWorkflowNodeID(),monitorID.getExperimentID(), monitorID.getJobExecutionContext().getGatewayID()); + TaskIdentifier taskIdentifier = new TaskIdentifier(monitorID.getTaskId(), monitorID.getWorkflowNodeID(),monitorID.getExperimentId(), monitorID.getJobExecutionContext().getGatewayID()); //FIXME this is a case where the output retrieving fails even if the job execution was a success. Thus updating the task status monitorPublisher.publish(new TaskStatusChangeRequestEvent(TaskState.FAILED, taskIdentifier)); try { http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java index b4790c7..1122c99 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java @@ -90,7 +90,7 @@ public class GSISSHDirectorySetupHandler extends AbstractHandler { detail.setTransferStatus(status); detail.setTransferDescription("Working directory = " + workingDirectory); - registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); + registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskId()); } catch (Exception e) { DataTransferDetails detail = new DataTransferDetails(); @@ -99,7 +99,7 @@ public class GSISSHDirectorySetupHandler extends AbstractHandler { status.setTransferState(TransferState.FAILED); detail.setTransferStatus(status); try { - registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); + registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskId()); GFacUtils.saveErrorDetails(jobExecutionContext, e.getCause().toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.FILE_SYSTEM_FAILURE); } catch (Exception e1) { throw new GFacHandlerException("Error persisting status", e1, e1.getLocalizedMessage()); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java index 3b36e86..394d3e6 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java @@ -129,7 +129,7 @@ public class GSISSHInputHandler extends AbstractHandler { status.setTransferState(TransferState.UPLOAD); detail.setTransferStatus(status); detail.setTransferDescription("Input Data Staged: " + stageInputFile); - registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); + registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskId()); GFacUtils.saveHandlerData(jobExecutionContext, temp.insert(0, ++index), this.getClass().getName()); } @@ -147,7 +147,7 @@ public class GSISSHInputHandler extends AbstractHandler { // status.setTransferState(TransferState.UPLOAD); // detail.setTransferStatus(status); // detail.setTransferDescription("Input Data Staged: " + stageInputFiles); -// registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); +// registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskId()); // StringBuffer temp = new StringBuffer(data.append(stageInputFiles).append(",").toString()); // GFacUtils.savePluginData(jobExecutionContext, temp.insert(0, ++index), this.getClass().getName()); // newFiles.add(stageInputFiles); @@ -165,7 +165,7 @@ public class GSISSHInputHandler extends AbstractHandler { detail.setTransferStatus(status); try { GFacUtils.saveErrorDetails(jobExecutionContext, e.getCause().toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.FILE_SYSTEM_FAILURE); - registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); + registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskId()); } catch (Exception e1) { throw new GFacHandlerException("Error persisting status", e1, e1.getLocalizedMessage()); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java index 18dcb97..fef5be8 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java @@ -107,7 +107,7 @@ public class GSISSHOutputHandler extends AbstractHandler { } } - String timeStampedExperimentID = GFacUtils.createUniqueNameWithDate(jobExecutionContext.getExperimentID()); + String timeStampedExperimentID = GFacUtils.createUniqueNameWithDate(jobExecutionContext.getExperimentId()); TaskDetails taskData = jobExecutionContext.getTaskData(); String outputDataDir = null; @@ -120,7 +120,7 @@ public class GSISSHOutputHandler extends AbstractHandler { if (outputDataDir == null) { outputDataDir = File.separator + "tmp"; } - outputDataDir = outputDataDir + File.separator + jobExecutionContext.getExperimentID() + "-" + jobExecutionContext.getTaskData().getTaskID(); + outputDataDir = outputDataDir + File.separator + jobExecutionContext.getExperimentId() + "-" + jobExecutionContext.getTaskData().getTaskId(); (new File(outputDataDir)).mkdirs(); String stdOutStr = ""; @@ -159,12 +159,12 @@ public class GSISSHOutputHandler extends AbstractHandler { status.setTransferState(TransferState.STDOUT_DOWNLOAD); detail.setTransferStatus(status); detail.setTransferDescription("STDOUT:" + localStdOutFile.getAbsolutePath()); - registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); + registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskId()); status.setTransferState(TransferState.STDERROR_DOWNLOAD); detail.setTransferStatus(status); detail.setTransferDescription("STDERR:" + localStdErrFile.getAbsolutePath()); - registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); + registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskId()); //todo this is a mess we have to fix this List<OutputDataObjectType> outputArray = new ArrayList<OutputDataObjectType>(); @@ -296,15 +296,15 @@ public class GSISSHOutputHandler extends AbstractHandler { status.setTransferState(TransferState.DOWNLOAD); detail.setTransferStatus(status); detail.setTransferDescription(outputDataDir); - registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); - registry.add(ChildDataType.EXPERIMENT_OUTPUT, outputArray, jobExecutionContext.getExperimentID()); + registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskId()); + registry.add(ChildDataType.EXPERIMENT_OUTPUT, outputArray, jobExecutionContext.getExperimentId()); fireTaskOutputChangeEvent(jobExecutionContext, outputArray); } catch (Exception e) { try { status.setTransferState(TransferState.FAILED); detail.setTransferStatus(status); detail.setTransferDescription(e.getLocalizedMessage()); - registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); + registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskId()); GFacUtils.saveErrorDetails(jobExecutionContext, e.getCause().toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.FILE_SYSTEM_FAILURE); } catch (Exception e1) { throw new GFacHandlerException("Error persisting status", e1, e1.getLocalizedMessage()); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java index ed94312..6c1d1e0 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java @@ -63,7 +63,7 @@ public class NewGSISSHOutputHandler extends AbstractHandler{ super.invoke(jobExecutionContext); List<OutputDataObjectType> outputArray = HandleOutputs.handleOutputs(jobExecutionContext, cluster); try { - registry.add(ChildDataType.EXPERIMENT_OUTPUT, outputArray, jobExecutionContext.getExperimentID()); + registry.add(ChildDataType.EXPERIMENT_OUTPUT, outputArray, jobExecutionContext.getExperimentId()); } catch (RegistryException e) { throw new GFacHandlerException(e); }
