http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java index c0784fb..6059e0a 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/provider/impl/GSISSHProvider.java @@ -112,13 +112,13 @@ public class GSISSHProvider extends AbstractProvider { String jobID = cluster.submitBatchJob(jobDescriptor); jobExecutionContext.setJobDetails(jobDetails); if (jobID == null) { - jobDetails.setJobID("none"); + jobDetails.setJobId("none"); GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.FAILED, monitorPublisher); } else { - jobDetails.setJobID(jobID.split("\\.")[0]); + jobDetails.setJobId(jobID.split("\\.")[0]); GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.SUBMITTED, monitorPublisher); } - data.append(",jobId=").append(jobDetails.getJobID()); + data.append(",jobId=").append(jobDetails.getJobId()); // Now job has submitted to the resource, its up to the Provider to parse the information to daemon handler // to perform monitoring, daemon handlers can be accessed from anywhere @@ -127,7 +127,7 @@ public class GSISSHProvider extends AbstractProvider { } catch (Exception e) { String error = "Error submitting the job to host " + computeResourceDescription.getHostName() + " message: " + e.getMessage(); log.error(error); - jobDetails.setJobID("none"); + jobDetails.setJobId("none"); GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.FAILED, monitorPublisher); StringWriter errors = new StringWriter(); e.printStackTrace(new PrintWriter(errors)); @@ -201,9 +201,9 @@ public class GSISSHProvider extends AbstractProvider { log.error("There is not JobDetails so cancelations cannot perform !!!"); return false; } - if (jobDetails.getJobID() != null) { + if (jobDetails.getJobId() != null) { // if this operation success without any exceptions, we can assume cancel operation succeeded. - cluster.cancelJob(jobDetails.getJobID()); + cluster.cancelJob(jobDetails.getJobId()); } else { log.error("No Job Id is set, so cannot perform the cancel operation !!!"); return false; @@ -214,14 +214,14 @@ public class GSISSHProvider extends AbstractProvider { } catch (SSHApiException e) { String error = "Error submitting the job to host " + jobExecutionContext.getHostName() + " message: " + e.getMessage(); log.error(error); - jobDetails.setJobID("none"); + jobDetails.setJobId("none"); GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.FAILED, monitorPublisher); GFacUtils.saveErrorDetails(jobExecutionContext, e.getCause().toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR); throw new GFacProviderException(error, e); } catch (Exception e) { String error = "Error submitting the job to host " + jobExecutionContext.getHostName() + " message: " + e.getMessage(); log.error(error); - jobDetails.setJobID("none"); + jobDetails.setJobId("none"); GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.FAILED, monitorPublisher); GFacUtils.saveErrorDetails(jobExecutionContext, e.getCause().toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR); throw new GFacProviderException(error, e); @@ -230,7 +230,7 @@ public class GSISSHProvider extends AbstractProvider { public void recover(JobExecutionContext jobExecutionContext) throws GFacProviderException,GFacException { // have to implement the logic to recover a gfac failure - log.info("Invoking Recovering for the Experiment: " + jobExecutionContext.getExperimentID()); + log.info("Invoking Recovering for the Experiment: " + jobExecutionContext.getExperimentId()); ComputeResourceDescription computeResourceDescription = jobExecutionContext.getApplicationContext() .getComputeResourceDescription(); String hostName = jobExecutionContext.getHostName(); @@ -275,7 +275,7 @@ public class GSISSHProvider extends AbstractProvider { // Now we are we have enough data to recover JobDetails jobDetails = new JobDetails(); jobDetails.setJobDescription(jobDesc); - jobDetails.setJobID(jobId); + jobDetails.setJobId(jobId); jobExecutionContext.setJobDetails(jobDetails); if (jobExecutionContext.getSecurityContext(hostName) == null) { try { @@ -323,7 +323,7 @@ public class GSISSHProvider extends AbstractProvider { ThreadedHandler pullMonitorHandler = null; ThreadedHandler pushMonitorHandler = null; MonitorMode monitorMode = sshJobSubmission.getMonitorMode(); - String jobID = jobExecutionContext.getJobDetails().getJobID(); + String jobID = jobExecutionContext.getJobDetails().getJobId(); for (ThreadedHandler threadedHandler : daemonHandlers) { if ("org.apache.airavata.gfac.monitor.handlers.GridPullMonitorHandler".equals(threadedHandler.getClass().getName())) { pullMonitorHandler = threadedHandler;
http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java index 0428bc0..85f7f8e 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java @@ -282,7 +282,7 @@ public class GFACGSISSHUtils { ComputationalResourceScheduling taskScheduling = taskData.getTaskScheduling(); if (taskScheduling != null) { int totalNodeCount = taskScheduling.getNodeCount(); - int totalCPUCount = taskScheduling.getTotalCPUCount(); + int totalCPUCount = taskScheduling.getTotalCpuCount(); // jobDescriptor.setJobSubmitter(applicationDeploymentType.getJobSubmitterCommand()); if (taskScheduling.getComputationalProjectAccount() != null) { http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java b/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java index 630cd5c..a7a4767 100644 --- a/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java +++ b/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/GSISSHProviderTestWithMyProxyAuth.java @@ -221,9 +221,9 @@ // @Test // public void testGSISSHProvider() throws GFacException { // BetterGfacImpl gFacAPI = new BetterGfacImpl(); -// gFacAPI.submitJob(jobExecutionContext.getExperimentID(), jobExecutionContext.getTaskData().getTaskID(), jobExecutionContext.getGatewayID()); +// gFacAPI.submitJob(jobExecutionContext.getExperimentId(), jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getGatewayID()); // System.out.println(jobExecutionContext.getJobDetails().getJobDescription()); -// System.out.println(jobExecutionContext.getJobDetails().getJobID()); +// System.out.println(jobExecutionContext.getJobDetails().getJobId()); // } // //} http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java index ef66171..99f7e23 100644 --- a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java +++ b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java @@ -131,8 +131,8 @@ public class LocalProvider extends AbstractProvider { jobExecutionContext.getNotifier().publish(new StartExecutionEvent()); JobDetails jobDetails = new JobDetails(); try { - jobId = jobExecutionContext.getTaskData().getTaskID(); - jobDetails.setJobID(jobId); + jobId = jobExecutionContext.getTaskData().getTaskId(); + jobDetails.setJobId(jobId); jobDetails.setJobDescription(jobExecutionContext.getApplicationContext() .getApplicationDeploymentDescription().getAppDeploymentDescription()); jobExecutionContext.setJobDetails(jobDetails); @@ -175,10 +175,10 @@ public class LocalProvider extends AbstractProvider { // updating the job status to complete because there's nothing to monitor in local jobs // MonitorID monitorID = createMonitorID(jobExecutionContext); - 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()); this.getMonitorPublisher().publish(new JobStatusChangeEvent(JobState.COMPLETE, jobIdentity)); } catch (IOException io) { @@ -192,8 +192,8 @@ public class LocalProvider extends AbstractProvider { // private MonitorID createMonitorID(JobExecutionContext jobExecutionContext) { // MonitorID monitorID = new MonitorID(jobExecutionContext.getApplicationContext().getHostDescription(), jobId, -// jobExecutionContext.getTaskData().getTaskID(), -// jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getExperimentID(), +// jobExecutionContext.getTaskData().getTaskId(), +// jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getExperimentId(), // jobExecutionContext.getExperiment().getUserName(),jobId); // return monitorID; // } @@ -226,15 +226,15 @@ public class LocalProvider extends AbstractProvider { String stdErrStr = GFacUtils.readFileToString(jobExecutionContext.getStandardError()); Map<String, Object> output = jobExecutionContext.getOutMessageContext().getParameters(); OutputUtils.fillOutputFromStdout(output, stdOutStr, stdErrStr, outputArray); - TaskDetails taskDetails = (TaskDetails)registry.get(RegistryModelType.TASK_DETAIL, jobExecutionContext.getTaskData().getTaskID()); + TaskDetails taskDetails = (TaskDetails)registry.get(RegistryModelType.TASK_DETAIL, jobExecutionContext.getTaskData().getTaskId()); if (taskDetails != null){ taskDetails.setApplicationOutputs(outputArray); - registry.update(RegistryModelType.TASK_DETAIL, taskDetails, taskDetails.getTaskID()); + registry.update(RegistryModelType.TASK_DETAIL, taskDetails, taskDetails.getTaskId()); } - registry.add(ChildDataType.EXPERIMENT_OUTPUT, outputArray, jobExecutionContext.getExperimentID()); - TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskID(), + registry.add(ChildDataType.EXPERIMENT_OUTPUT, outputArray, jobExecutionContext.getExperimentId()); + TaskIdentifier taskIdentity = new TaskIdentifier(jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getWorkflowNodeDetails().getNodeInstanceId(), - jobExecutionContext.getExperimentID(), + jobExecutionContext.getExperimentId(), jobExecutionContext.getGatewayID()); getMonitorPublisher().publish(new TaskOutputChangeEvent(outputArray, taskIdentity)); } catch (XmlException e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-local/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-local/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java b/modules/gfac/gfac-local/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java index aeb8158..cb311ce 100644 --- a/modules/gfac/gfac-local/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java +++ b/modules/gfac/gfac-local/src/test/java/org/apache/airavata/core/gfac/services/impl/LocalProviderTest.java @@ -149,11 +149,11 @@ // // jobExecutionContext.setOutMessageContext(outMessage); // -// jobExecutionContext.setExperimentID("test123"); +// jobExecutionContext.setExperimentId("test123"); // jobExecutionContext.setExperiment(new Experiment("test123","project1","admin","testExp")); -// jobExecutionContext.setTaskData(new TaskDetails(jobExecutionContext.getExperimentID())); +// jobExecutionContext.setTaskData(new TaskDetails(jobExecutionContext.getExperimentId())); // jobExecutionContext.setRegistry(new LoggingRegistryImpl()); -// jobExecutionContext.setWorkflowNodeDetails(new WorkflowNodeDetails(jobExecutionContext.getExperimentID(),"none", ExecutionUnit.APPLICATION)); +// jobExecutionContext.setWorkflowNodeDetails(new WorkflowNodeDetails(jobExecutionContext.getExperimentId(),"none", ExecutionUnit.APPLICATION)); // // // } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java index 0c94daa..5c159a4 100644 --- a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java +++ b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java @@ -93,7 +93,7 @@ public class EmailBasedMonitor implements Runnable{ } public void addToJobMonitorMap(JobExecutionContext jobExecutionContext) { - String monitorId = jobExecutionContext.getJobDetails().getJobID(); + String monitorId = jobExecutionContext.getJobDetails().getJobId(); if (monitorId == null || monitorId.isEmpty()) { monitorId = jobExecutionContext.getJobDetails().getJobName(); } @@ -300,10 +300,10 @@ public class EmailBasedMonitor implements Runnable{ private void publishJobStatusChange(JobExecutionContext jobExecutionContext) { 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(jobExecutionContext.getJobDetails().getJobStatus().getJobState()); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java index ae463a7..3cc3c83 100644 --- a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java +++ b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/HPCMonitorID.java @@ -47,9 +47,9 @@ public class HPCMonitorID extends MonitorID { setComputeResourceDescription(computeResourceDescription); setJobStartedTime(new Timestamp((new Date()).getTime())); setUserName(userName); - setJobID(jobID); - setTaskID(taskID); - setExperimentID(experimentID); + setJobId(jobID); + setTaskId(taskID); + setExperimentId(experimentID); setWorkflowNodeID(workflowNodeID); } @@ -91,9 +91,9 @@ public class HPCMonitorID extends MonitorID { setUserName(((MyProxyAuthenticationInfo) this.authenticationInfo).getUserName()); } } - setJobID(jobID); - setTaskID(taskID); - setExperimentID(experimentID); + setJobId(jobID); + setTaskId(taskID); + setExperimentId(experimentID); setWorkflowNodeID(workflowNodeID); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java index 2476c85..822cf63 100644 --- a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java +++ b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java @@ -89,7 +89,7 @@ public class GridPullMonitorHandler extends ThreadedHandler implements Watcher{ try { /* ZooKeeper zk = jobExecutionContext.getZk(); try { - String experimentEntry = GFacUtils.findExperimentEntry(jobExecutionContext.getExperimentID(), zk); + String experimentEntry = GFacUtils.findExperimentEntry(jobExecutionContext.getExperimentId(), zk); String path = experimentEntry + File.separator + "operation"; Stat exists = zk.exists(path, this); if (exists != null) { @@ -103,8 +103,8 @@ public class GridPullMonitorHandler extends ThreadedHandler implements Watcher{ CommonUtils.addMonitortoQueue(hpcPullMonitor.getQueue(), monitorID, jobExecutionContext); CommonUtils.increaseZkJobCount(monitorID); // update change job count to zookeeper } catch (AiravataMonitorException e) { - logger.errorId(monitorID.getJobID(), "Error adding job {} monitorID object to the queue with experiment {}", - monitorID.getJobID(), monitorID.getExperimentID()); + logger.errorId(monitorID.getJobId(), "Error adding job {} monitorID object to the queue with experiment {}", + monitorID.getJobId(), monitorID.getExperimentId()); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java index 3442367..d4e5929 100644 --- a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java +++ b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java @@ -185,15 +185,15 @@ public class HPCPullMonitor extends PullMonitor { MonitorID iMonitorID = monitorIDListIterator.next(); while (iterator1.hasNext()) { String cancelMId = iterator1.next(); - if (cancelMId.equals(iMonitorID.getExperimentID() + "+" + iMonitorID.getTaskID())) { + if (cancelMId.equals(iMonitorID.getExperimentId() + "+" + iMonitorID.getTaskId())) { iMonitorID.setStatus(JobState.CANCELED); // CommonUtils.removeMonitorFromQueue(take, iMonitorID); removeList.add(iMonitorID); logger.debugId(cancelMId, "Found a match in cancel monitor queue, hence moved to the " + "completed job queue, experiment {}, task {} , job {}", - iMonitorID.getExperimentID(), iMonitorID.getTaskID(), iMonitorID.getJobID()); + iMonitorID.getExperimentId(), iMonitorID.getTaskId(), iMonitorID.getJobId()); logger.info("Job cancelled: marking the Job as ************CANCELLED************ experiment {}, task {}, job name {} .", - iMonitorID.getExperimentID(), iMonitorID.getTaskID(), iMonitorID.getJobName()); + iMonitorID.getExperimentId(), iMonitorID.getTaskId(), iMonitorID.getJobName()); sendNotification(iMonitorID); logger.info("To avoid timing issues we sleep sometime and try to retrieve output files"); Thread.sleep(10000); @@ -217,10 +217,10 @@ public class HPCPullMonitor extends PullMonitor { // CommonUtils.removeMonitorFromQueue(take, iMonitorID);//we have to make this empty everytime we iterate, otherwise this list will accumulate and will lead to a memory leak removeList.add(iMonitorID); logger.debugId(completeId, "Push notification updated job {} status to {}. " + - "experiment {} , task {}.", iMonitorID.getJobID(), JobState.COMPLETE.toString(), - iMonitorID.getExperimentID(), iMonitorID.getTaskID()); + "experiment {} , task {}.", iMonitorID.getJobId(), JobState.COMPLETE.toString(), + iMonitorID.getExperimentId(), iMonitorID.getTaskId()); logger.info("AMQP message recieved: marking the Job as ************COMPLETE************ experiment {}, task {}, job name {} .", - iMonitorID.getExperimentID(), iMonitorID.getTaskID(), iMonitorID.getJobName()); + iMonitorID.getExperimentId(), iMonitorID.getTaskId(), iMonitorID.getJobName()); sendNotification(iMonitorID); logger.info("To avoid timing issues we sleep sometime and try to retrieve output files"); @@ -242,17 +242,17 @@ public class HPCPullMonitor extends PullMonitor { currentMonitorID = iMonitorID; if (!JobState.CANCELED.equals(iMonitorID.getStatus()) && !JobState.COMPLETE.equals(iMonitorID.getStatus())) { - iMonitorID.setStatus(jobStatuses.get(iMonitorID.getJobID() + "," + iMonitorID.getJobName())); //IMPORTANT this is NOT a simple setter we have a logic + iMonitorID.setStatus(jobStatuses.get(iMonitorID.getJobId() + "," + iMonitorID.getJobName())); //IMPORTANT this is NOT a simple setter we have a logic } else if (JobState.COMPLETE.equals(iMonitorID.getStatus())) { - logger.debugId(iMonitorID.getJobID(), "Moved job {} to completed jobs map, experiment {}, " + - "task {}", iMonitorID.getJobID(), iMonitorID.getExperimentID(), iMonitorID.getTaskID()); + logger.debugId(iMonitorID.getJobId(), "Moved job {} to completed jobs map, experiment {}, " + + "task {}", iMonitorID.getJobId(), iMonitorID.getExperimentId(), iMonitorID.getTaskId()); // CommonUtils.removeMonitorFromQueue(take, iMonitorID); removeList.add(iMonitorID); logger.info("PULL Notification is complete: marking the Job as ************COMPLETE************ experiment {}, task {}, job name {} .", - iMonitorID.getExperimentID(), iMonitorID.getTaskID(), iMonitorID.getJobName()); + iMonitorID.getExperimentId(), iMonitorID.getTaskId(), iMonitorID.getJobName()); GFacThreadPoolExecutor.getCachedThreadPool().execute(new OutHandlerWorker(gfac, iMonitorID, publisher)); } - iMonitorID.setStatus(jobStatuses.get(iMonitorID.getJobID() + "," + iMonitorID.getJobName())); //IMPORTANT this is not a simple setter we have a logic + iMonitorID.setStatus(jobStatuses.get(iMonitorID.getJobId() + "," + iMonitorID.getJobName())); //IMPORTANT this is not a simple setter we have a logic iMonitorID.setLastMonitored(new Timestamp((new Date()).getTime())); sendNotification(iMonitorID); // if the job is completed we do not have to put the job to the queue again @@ -280,11 +280,11 @@ public class HPCPullMonitor extends PullMonitor { } if (stdOut != null && stdOut.size() > 0 && !stdOut.get(0).isEmpty()) { // have to be careful with this iMonitorID.setStatus(JobState.COMPLETE); - logger.errorId(iMonitorID.getJobID(), "Job monitoring failed {} times, " + + logger.errorId(iMonitorID.getJobId(), "Job monitoring failed {} times, " + " Experiment {} , task {}", iMonitorID.getFailedCount(), - iMonitorID.getExperimentID(), iMonitorID.getTaskID()); + iMonitorID.getExperimentId(), iMonitorID.getTaskId()); logger.info("Listing directory came as complete: marking the Job as ************COMPLETE************ experiment {}, task {}, job name {} .", - iMonitorID.getExperimentID(), iMonitorID.getTaskID(), iMonitorID.getJobName()); + iMonitorID.getExperimentId(), iMonitorID.getTaskId(), iMonitorID.getJobName()); sendNotification(iMonitorID); // CommonUtils.removeMonitorFromQueue(take, iMonitorID); removeList.add(iMonitorID); @@ -331,7 +331,7 @@ public class HPCPullMonitor extends PullMonitor { e1.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. } } - logger.error("Error handling the job with Job ID:" + currentMonitorID.getJobID()); + logger.error("Error handling the job with Job ID:" + currentMonitorID.getJobId()); throw new AiravataMonitorException(e); } catch (SSHApiException e) { logger.error(e.getMessage()); @@ -340,10 +340,10 @@ public class HPCPullMonitor extends PullMonitor { jobStatus.setState(JobState.UNKNOWN); JobIdentifier jobIdentifier = new JobIdentifier("UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN", "UNKNOWN"); if (currentMonitorID != null){ - jobIdentifier.setExperimentId(currentMonitorID.getExperimentID()); - jobIdentifier.setTaskId(currentMonitorID.getTaskID()); + jobIdentifier.setExperimentId(currentMonitorID.getExperimentId()); + jobIdentifier.setTaskId(currentMonitorID.getTaskId()); jobIdentifier.setWorkflowNodeId(currentMonitorID.getWorkflowNodeID()); - jobIdentifier.setJobId(currentMonitorID.getJobID()); + jobIdentifier.setJobId(currentMonitorID.getJobId()); jobIdentifier.setGatewayId(currentMonitorID.getJobExecutionContext().getGatewayID()); } jobStatus.setJobIdentity(jobIdentifier); @@ -371,10 +371,10 @@ public class HPCPullMonitor extends PullMonitor { private void sendNotification(MonitorID iMonitorID) { JobStatusChangeRequestEvent jobStatus = new JobStatusChangeRequestEvent(); - JobIdentifier jobIdentity = new JobIdentifier(iMonitorID.getJobID(), - iMonitorID.getTaskID(), + JobIdentifier jobIdentity = new JobIdentifier(iMonitorID.getJobId(), + iMonitorID.getTaskId(), iMonitorID.getWorkflowNodeID(), - iMonitorID.getExperimentID(), + iMonitorID.getExperimentId(), iMonitorID.getJobExecutionContext().getGatewayID()); jobStatus.setJobIdentity(jobIdentity); jobStatus.setState(iMonitorID.getStatus()); @@ -463,7 +463,7 @@ public class HPCPullMonitor extends PullMonitor { CommonUtils.removeMonitorFromQueue(userMonitorData, iMonitorId); } catch (AiravataMonitorException e) { logger.error(e.getMessage(), e); - logger.error("Error deleting the monitor data: " + iMonitorId.getJobID()); + logger.error("Error deleting the monitor data: " + iMonitorId.getJobId()); } } removeList.clear(); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/ResourceConnection.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/ResourceConnection.java b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/ResourceConnection.java index f718535..1c32c11 100644 --- a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/ResourceConnection.java +++ b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/ResourceConnection.java @@ -85,7 +85,7 @@ public class ResourceConnection { } public JobState getJobStatus(MonitorID monitorID) throws SSHApiException { - String jobID = monitorID.getJobID(); + String jobID = monitorID.getJobId(); //todo so currently we execute the qstat for each job but we can use user based monitoring //todo or we should concatenate all the commands and execute them in one go and parseSingleJob the response return getStatusFromString(cluster.getJobStatus(jobID).toString()); @@ -97,7 +97,7 @@ public class ResourceConnection { // creating a sorted map with all the jobIds and with the predefined // status as UNKNOWN for (MonitorID monitorID : monitorIDs) { - treeMap.put(monitorID.getJobID()+","+monitorID.getJobName(), JobStatus.U); + treeMap.put(monitorID.getJobId()+","+monitorID.getJobName(), JobStatus.U); } String userName = cluster.getServerInfo().getUserName(); //todo so currently we execute the qstat for each job but we can use user based monitoring http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/AMQPMonitor.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/AMQPMonitor.java b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/AMQPMonitor.java index de8cd8c..0b37cb6 100644 --- a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/AMQPMonitor.java +++ b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/push/amqp/AMQPMonitor.java @@ -135,7 +135,7 @@ public class AMQPMonitor extends PushMonitor { } } } else { - throw new AiravataMonitorException("Couldn't register monitor for jobId :" + monitorID.getJobID() + + throw new AiravataMonitorException("Couldn't register monitor for jobId :" + monitorID.getJobId() + " , ComputeResourceDescription " + computeResourceDescription.getHostName() + " doesn't has an " + "IpAddress with it"); } @@ -174,7 +174,7 @@ public class AMQPMonitor extends PushMonitor { MonitorID next = null; while(iterator.hasNext()){ next = iterator.next(); - if(next.getJobID().endsWith(monitorID.getJobID())){ + if(next.getJobId().endsWith(monitorID.getJobId())){ break; } } @@ -209,10 +209,10 @@ public class AMQPMonitor extends PushMonitor { } } next.setStatus(monitorID.getStatus()); - JobIdentifier jobIdentity = new JobIdentifier(next.getJobID(), - next.getTaskID(), + JobIdentifier jobIdentity = new JobIdentifier(next.getJobId(), + next.getTaskId(), next.getWorkflowNodeID(), - next.getExperimentID(), + next.getExperimentId(), next.getJobExecutionContext().getGatewayID()); publisher.publish(new JobStatusChangeEvent(next.getStatus(),jobIdentity)); return true; http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java index 15b7241..98c7367 100644 --- a/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java +++ b/modules/gfac/gfac-monitor/gfac-hpc-monitor/src/main/java/org/apache/airavata/gfac/monitor/util/CommonUtils.java @@ -75,8 +75,8 @@ public class CommonUtils { if (isEqual(host.getComputeResourceDescription(), monitorID.getComputeResourceDescription())) { // ok we found right place to add this monitorID host.addMonitorIDForHost(monitorID); - logger.debugId(monitorID.getJobID(), "Added new job to the monitoring queue, experiment {}," + - " task {}", monitorID.getExperimentID(), monitorID.getTaskID()); + logger.debugId(monitorID.getJobId(), "Added new job to the monitoring queue, experiment {}," + + " task {}", monitorID.getExperimentId(), monitorID.getTaskId()); return; } } @@ -85,8 +85,8 @@ public class CommonUtils { HostMonitorData hostMonitorData = new HostMonitorData(jobExecutionContext); hostMonitorData.addMonitorIDForHost(monitorID); next.addHostMonitorData(hostMonitorData); - logger.debugId(monitorID.getJobID(), "Added new job to the monitoring queue, experiment {}," + - " task {}", monitorID.getExperimentID(), monitorID.getTaskID()); + logger.debugId(monitorID.getJobId(), "Added new job to the monitoring queue, experiment {}," + + " task {}", monitorID.getExperimentId(), monitorID.getTaskId()); return; } } @@ -97,8 +97,8 @@ public class CommonUtils { userMonitorData.addHostMonitorData(hostMonitorData); try { queue.put(userMonitorData); - logger.debugId(monitorID.getJobID(), "Added new job to the monitoring queue, experiment {}," + - " task {}", monitorID.getExperimentID(), monitorID.getTaskID()); + logger.debugId(monitorID.getJobId(), "Added new job to the monitoring queue, experiment {}," + + " task {}", monitorID.getExperimentId(), monitorID.getTaskId()); } catch (InterruptedException e) { throw new AiravataMonitorException(e); } @@ -138,13 +138,13 @@ public class CommonUtils { Iterator<MonitorID> iterator2 = iHostMonitorID.getMonitorIDs().iterator(); while (iterator2.hasNext()) { MonitorID iMonitorID = iterator2.next(); - if (iMonitorID.getJobID().equals(monitorID.getJobID()) + if (iMonitorID.getJobId().equals(monitorID.getJobId()) || iMonitorID.getJobName().equals(monitorID.getJobName())) { // OK we found the object, we cannot do list.remove(object) states of two objects // could be different, thats why we check the jobID iterator2.remove(); - logger.infoId(monitorID.getJobID(), "Removed the jobId: {} JobName: {} from monitoring last " + - "status:{}", monitorID.getJobID(),monitorID.getJobName(), monitorID.getStatus().toString()); + logger.infoId(monitorID.getJobId(), "Removed the jobId: {} JobName: {} from monitoring last " + + "status:{}", monitorID.getJobId(),monitorID.getJobName(), monitorID.getStatus().toString()); return; } @@ -153,7 +153,7 @@ public class CommonUtils { } } logger.info("Cannot find the given MonitorID in the queue with userName " + - monitorID.getUserName() + " and jobID " + monitorID.getJobID()); + monitorID.getUserName() + " and jobID " + monitorID.getJobId()); logger.info("This might not be an error because someone else removed this job from the queue"); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java index 46f1dc3..bdf4f36 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java @@ -121,7 +121,7 @@ public class AdvancedSCPInputHandler extends AbstractHandler { } // Server info - String parentPath = inputPath + File.separator + jobExecutionContext.getExperimentID() + File.separator + jobExecutionContext.getTaskData().getTaskID(); + String parentPath = inputPath + File.separator + jobExecutionContext.getExperimentId() + File.separator + jobExecutionContext.getTaskData().getTaskId(); if (index < oldIndex) { parentPath = oldFiles.get(index); data.append(oldFiles.get(index++)).append(","); // we get already transfered file and increment the index @@ -166,7 +166,7 @@ public class AdvancedSCPInputHandler 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()); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java index 0a2aa8d..b034f73 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java @@ -136,7 +136,7 @@ public class AdvancedSCPOutputHandler extends AbstractHandler { String key = GFACSSHUtils.prepareSecurityContext(jobExecutionContext, authenticationInfo, this.userName, this.hostName, DEFAULT_SSH_PORT); pbsCluster = ((SSHSecurityContext)jobExecutionContext.getSecurityContext(key)).getPbsCluster(); if(jobExecutionContext.getTaskData().getAdvancedOutputDataHandling() != null && !jobExecutionContext.getTaskData().getAdvancedOutputDataHandling().isPersistOutputData()){ - outputPath = outputPath + File.separator + jobExecutionContext.getExperimentID() + "-" + jobExecutionContext.getTaskData().getTaskID() + outputPath = outputPath + File.separator + jobExecutionContext.getExperimentId() + "-" + jobExecutionContext.getTaskData().getTaskId() + File.separator; pbsCluster.makeDirectory(outputPath); } @@ -194,7 +194,7 @@ public class AdvancedSCPOutputHandler extends AbstractHandler { outputArray.add(dataObjectType); } } - registry.add(ChildDataType.EXPERIMENT_OUTPUT, outputArray, jobExecutionContext.getExperimentID()); + registry.add(ChildDataType.EXPERIMENT_OUTPUT, outputArray, jobExecutionContext.getExperimentId()); } catch (SSHApiException e) { try { StringWriter errors = new StringWriter(); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java index 93d0ed0..92b7524 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java @@ -56,7 +56,7 @@ public class NewSSHOutputHandler 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); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java index a985bd3..bfcaab3 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java @@ -92,7 +92,7 @@ public class SSHDirectorySetupHandler 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(); @@ -101,7 +101,7 @@ public class SSHDirectorySetupHandler extends AbstractHandler { detail.setTransferStatus(status); detail.setTransferDescription("Working directory = " + jobExecutionContext.getWorkingDir()); try { - registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); + registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskId()); StringWriter errors = new StringWriter(); e.printStackTrace(new PrintWriter(errors)); GFacUtils.saveErrorDetails(jobExecutionContext, errors.toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.FILE_SYSTEM_FAILURE); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java index b2210a9..be7b8e2 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java @@ -108,7 +108,7 @@ public class SSHInputHandler 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()); } @@ -126,7 +126,7 @@ public class SSHInputHandler 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()); // newFiles.add(stageInputFiles); // StringBuffer temp = new StringBuffer(data.append(stageInputFiles).append(",").toString()); // GFacUtils.savePluginData(jobExecutionContext, temp.insert(0, ++index), this.getClass().getName()); @@ -144,7 +144,7 @@ public class SSHInputHandler extends AbstractHandler { StringWriter errors = new StringWriter(); e.printStackTrace(new PrintWriter(errors)); GFacUtils.saveErrorDetails(jobExecutionContext, errors.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-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java index f9eb1ef..29805ad 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java @@ -87,7 +87,7 @@ public class SSHOutputHandler extends AbstractHandler { } // Get the Stdouts and StdErrs - String timeStampedExperimentID = GFacUtils.createUniqueNameWithDate(jobExecutionContext.getExperimentID()); + String timeStampedExperimentID = GFacUtils.createUniqueNameWithDate(jobExecutionContext.getExperimentId()); TaskDetails taskData = jobExecutionContext.getTaskData(); String outputDataDir = null; @@ -100,7 +100,7 @@ public class SSHOutputHandler 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(); @@ -128,12 +128,12 @@ public class SSHOutputHandler 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()); List<OutputDataObjectType> outputArray = new ArrayList<OutputDataObjectType>(); @@ -224,14 +224,14 @@ public class SSHOutputHandler 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()); } catch (Exception e) { try { status.setTransferState(TransferState.FAILED); detail.setTransferStatus(status); - registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskID()); + registry.add(ChildDataType.DATA_TRANSFER_DETAIL, detail, jobExecutionContext.getTaskData().getTaskId()); StringWriter errors = new StringWriter(); e.printStackTrace(new PrintWriter(errors)); GFacUtils.saveErrorDetails(jobExecutionContext, errors.toString(), CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.FILE_SYSTEM_FAILURE); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java index 19ea3ac..11e1bb7 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java @@ -92,7 +92,7 @@ public class SSHProvider extends AbstractProvider { if (jobExecutionContext.getSecurityContext(hostAddress) == null) { GFACSSHUtils.addSecurityContext(jobExecutionContext); } - taskID = jobExecutionContext.getTaskData().getTaskID(); + taskID = jobExecutionContext.getTaskData().getTaskId(); JobSubmissionProtocol preferredJobSubmissionProtocol = jobExecutionContext.getPreferredJobSubmissionProtocol(); if (preferredJobSubmissionProtocol == JobSubmissionProtocol.SSH && resourceJobManagerType == ResourceJobManagerType.FORK) { @@ -100,7 +100,7 @@ public class SSHProvider extends AbstractProvider { cluster = ((SSHSecurityContext) jobExecutionContext.getSecurityContext(hostAddress)).getPbsCluster(); String remoteFile = jobExecutionContext.getWorkingDir() + File.separatorChar + Constants.EXECUTABLE_NAME; - details.setJobID(taskID); + details.setJobId(taskID); details.setJobDescription(remoteFile); jobExecutionContext.setJobDetails(details); // FIXME : Why cluster is passed as null @@ -164,7 +164,7 @@ public class SSHProvider extends AbstractProvider { jobDetails.setJobDescription(jobDescriptor.toXML()); String jobID = cluster.submitBatchJob(jobDescriptor); if (jobID != null && !jobID.isEmpty()) { - jobDetails.setJobID(jobID); + jobDetails.setJobId(jobID); GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.SUBMITTED, monitorPublisher); monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext) , GfacExperimentState.JOBSUBMITTED)); @@ -180,7 +180,7 @@ public class SSHProvider extends AbstractProvider { if (verifyJobId != null && !verifyJobId.isEmpty()) { // JobStatus either changed from SUBMITTED to QUEUED or directly to QUEUED jobID = verifyJobId; - jobDetails.setJobID(jobID); + jobDetails.setJobId(jobID); monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext) , GfacExperimentState.JOBSUBMITTED)); GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.QUEUED, monitorPublisher); @@ -188,24 +188,24 @@ public class SSHProvider extends AbstractProvider { } if (jobID == null || jobID.isEmpty()) { - log.error("Couldn't find remote jobId for JobName:" + jobDetails.getJobName() + ", ExperimentId:" + jobExecutionContext.getExperimentID()); - GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentID(), ExperimentState.FAILED); + log.error("Couldn't find remote jobId for JobName:" + jobDetails.getJobName() + ", ExperimentId:" + jobExecutionContext.getExperimentId()); + GFacUtils.updateExperimentStatus(jobExecutionContext.getExperimentId(), ExperimentState.FAILED); return; } data.append("jobDesc=").append(jobDescriptor.toXML()); - data.append(",jobId=").append(jobDetails.getJobID()); + data.append(",jobId=").append(jobDetails.getJobId()); monitor(jobExecutionContext); } catch (SSHApiException e) { String error = "Error submitting the job to host " + jobExecutionContext.getHostName() + " message: " + e.getMessage(); log.error(error); - jobDetails.setJobID("none"); + jobDetails.setJobId("none"); GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.FAILED, monitorPublisher); GFacUtils.saveErrorDetails(jobExecutionContext, error, CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR); throw new GFacProviderException(error, e); } catch (Exception e) { String error = "Error submitting the job to host " + jobExecutionContext.getHostName() + " message: " + e.getMessage(); log.error(error); - jobDetails.setJobID("none"); + jobDetails.setJobId("none"); GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.FAILED, monitorPublisher); GFacUtils.saveErrorDetails(jobExecutionContext, error, CorrectiveAction.CONTACT_SUPPORT, ErrorCategory.AIRAVATA_INTERNAL_ERROR); throw new GFacProviderException(error, e); @@ -259,8 +259,8 @@ public class SSHProvider extends AbstractProvider { return false; } try { - if (jobDetails.getJobID() != null) { - if (cluster.cancelJob(jobDetails.getJobID()) != null) { + if (jobDetails.getJobId() != null) { + if (cluster.cancelJob(jobDetails.getJobId()) != null) { // if this operation success without any exceptions, we can assume cancel operation succeeded. GFacUtils.saveJobStatus(jobExecutionContext, jobDetails, JobState.CANCELED, monitorPublisher); return true; @@ -379,7 +379,7 @@ public class SSHProvider extends AbstractProvider { // have to implement the logic to recover a gfac failure initialize(jobExecutionContext); if(hpcType) { - log.info("Invoking Recovering for the Experiment: " + jobExecutionContext.getExperimentID()); + log.info("Invoking Recovering for the Experiment: " + jobExecutionContext.getExperimentId()); String hostName = jobExecutionContext.getHostName(); String jobId = ""; String jobDesc = ""; @@ -421,7 +421,7 @@ public class SSHProvider extends AbstractProvider { // Now we are we have enough data to recover JobDetails jobDetails = new JobDetails(); jobDetails.setJobDescription(jobDesc); - jobDetails.setJobID(jobId); + jobDetails.setJobId(jobId); jobDetails.setJobName(jobName); jobExecutionContext.setJobDetails(jobDetails); if (jobExecutionContext.getSecurityContext(hostName) == null) { http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java index b38a170..633a040 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java @@ -426,7 +426,7 @@ public class GFACSSHUtils { ComputationalResourceScheduling taskScheduling = taskData.getTaskScheduling(); if (taskScheduling != null) { int totalNodeCount = taskScheduling.getNodeCount(); - int totalCPUCount = taskScheduling.getTotalCPUCount(); + int totalCPUCount = taskScheduling.getTotalCpuCount(); if (taskScheduling.getComputationalProjectAccount() != null) { http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java index 704528f..c6211a5 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java @@ -24,7 +24,7 @@ public class HandleOutputs { public static List<OutputDataObjectType> handleOutputs(JobExecutionContext jobExecutionContext, Cluster cluster) throws GFacHandlerException { List<OutputDataObjectType> outputArray = new ArrayList<OutputDataObjectType>(); try { - String outputDataDir = File.separator + "tmp" + File.separator + jobExecutionContext.getExperimentID(); + String outputDataDir = File.separator + "tmp" + File.separator + jobExecutionContext.getExperimentId(); (new File(outputDataDir)).mkdirs(); List<OutputDataObjectType> outputs = jobExecutionContext.getTaskData().getApplicationOutputs(); http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java b/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java index c65f386..ebcd892 100644 --- a/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java +++ b/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/BigRed2TestWithSSHAuth.java @@ -244,9 +244,9 @@ // @Test // public void testSSHProvider() throws GFacException { // BetterGfacImpl gFacAPI = new BetterGfacImpl(); -// gFacAPI.submitJob(jobExecutionContext.getExperimentID(), jobExecutionContext.getTaskData().getTaskID(), jobExecutionContext.getGatewayID()); +// gFacAPI.submitJob(jobExecutionContext.getExperimentId(), jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getGatewayID()); // org.junit.Assert.assertNotNull(jobExecutionContext.getJobDetails().getJobDescription()); -// org.junit.Assert.assertNotNull(jobExecutionContext.getJobDetails().getJobID()); +// org.junit.Assert.assertNotNull(jobExecutionContext.getJobDetails().getJobId()); // } // //} http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java b/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java index b115b6c..bf81017 100644 --- a/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java +++ b/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/SSHProviderTestWithSSHAuth.java @@ -165,7 +165,7 @@ // @Test // public void testLocalProvider() throws GFacException { // BetterGfacImpl gFacAPI = new BetterGfacImpl(); -// gFacAPI.submitJob(jobExecutionContext.getExperimentID(), jobExecutionContext.getTaskData().getTaskID(), jobExecutionContext.getGatewayID()); +// gFacAPI.submitJob(jobExecutionContext.getExperimentId(), jobExecutionContext.getTaskData().getTaskId(), jobExecutionContext.getGatewayID()); // MessageContext outMessageContext = jobExecutionContext.getOutMessageContext(); // Assert.assertEquals(MappingFactory.toString((ActualParameter)outMessageContext.getParameter("echo_output")), "hello"); // } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java ---------------------------------------------------------------------- diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java index a23fff0..226c125 100644 --- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java +++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java @@ -110,7 +110,7 @@ public class DataRetrievalIT extends AbstractIntegrationTest { log.info("\t"+user+" : "+data.size()+" experiments"); Assert.assertEquals(listUserExperiments.size(), data.size()); for (Experiment experiment : listUserExperiments) { - Assert.assertThat(experiment.getExperimentID(), isIn(data)); + Assert.assertThat(experiment.getExperimentId(), isIn(data)); } } } @@ -125,7 +125,7 @@ public class DataRetrievalIT extends AbstractIntegrationTest { log.info("\t"+project+" : "+data.size()+" experiments"); Assert.assertEquals(listProjectExperiments.size(), data.size()); for (Experiment experiment : listProjectExperiments) { - Assert.assertThat(experiment.getExperimentID(), isIn(data)); + Assert.assertThat(experiment.getExperimentId(), isIn(data)); } } } @@ -141,7 +141,7 @@ public class DataRetrievalIT extends AbstractIntegrationTest { log.info("\t"+user+" : "+data.size()+" projects"); Assert.assertEquals(listUserProjects.size(), 4); // for (Project project : listUserProjects) { -// Assert.assertThat(project.getProjectID(), isIn(data)); +// Assert.assertThat(project.getProjectId(), isIn(data)); // } } } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java index 1b3e1f3..4bf612a 100644 --- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java +++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java @@ -433,7 +433,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface, } ApplicationDeploymentDescription applicationDeploymentDescription = getAppDeployment(taskData, applicationId); taskData.setApplicationDeploymentId(applicationDeploymentDescription.getAppDeploymentId()); - registry.update(RegistryModelType.TASK_DETAIL, taskData,taskData.getTaskID()); + registry.update(RegistryModelType.TASK_DETAIL, taskData,taskData.getTaskId()); List<Object> workflowNodeDetailList = registry.get(RegistryModelType.WORKFLOW_NODE_DETAIL, org.apache.airavata.registry.cpi.utils.Constants.FieldConstants.WorkflowNodeConstants.TASK_LIST, taskData); if (workflowNodeDetailList != null @@ -562,7 +562,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface, TaskDetails taskDetails = (TaskDetails) o; TaskStatus taskStatus = ((TaskDetails) o).getTaskStatus(); if (taskStatus.getExecutionState().getValue() > 7 && taskStatus.getExecutionState().getValue()<12) { - log.error(((TaskDetails) o).getTaskID() + " Task status cannot mark as cancelled, because " + + log.error(((TaskDetails) o).getTaskId() + " Task status cannot mark as cancelled, because " + "current task state is " + ((TaskDetails) o).getTaskStatus().getExecutionState().toString()); continue;// this continue is very useful not to process deeper loops if the upper layers have non-cancel states } else { @@ -571,7 +571,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface, .getTimeInMillis()); taskDetails.setTaskStatus(taskStatus); registry.update(RegistryModelType.TASK_DETAIL, o, - taskDetails.getTaskID()); + taskDetails.getTaskId()); } orchestrator.cancelExperiment(experiment, workflowNodeDetail, taskDetails, tokenId); @@ -721,9 +721,9 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface, MessageContext messageContext = new MessageContext(event, MessageType.EXPERIMENT, messageId, gatewayId); messageContext.setUpdatedTime(AiravataUtils.getCurrentTimestamp()); publisher.publish(messageContext); - registry.update(RegistryModelType.TASK_DETAIL, taskData, taskData.getTaskID()); + registry.update(RegistryModelType.TASK_DETAIL, taskData, taskData.getTaskId()); //launching the experiment - launchTask(taskData.getTaskID(), airavataCredStoreToken); + launchTask(taskData.getTaskId(), airavataCredStoreToken); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/orchestrator/airavata-orchestrator-stubs/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-stubs/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java b/modules/orchestrator/airavata-orchestrator-stubs/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java index ad3edb3..c388bb6 100644 --- a/modules/orchestrator/airavata-orchestrator-stubs/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java +++ b/modules/orchestrator/airavata-orchestrator-stubs/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java @@ -1576,7 +1576,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public launchExperiment_args(launchExperiment_args other) { - if (other.isSetExperimentId()) { + if (other.issetExperimentId()) { this.experimentId = other.experimentId; } if (other.isSetAiravataCredStoreToken()) { @@ -1608,7 +1608,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field experimentId is set (has been assigned a value) and false otherwise */ - public boolean isSetExperimentId() { + public boolean issetExperimentId() { return this.experimentId != null; } @@ -1683,7 +1683,7 @@ import org.slf4j.LoggerFactory; switch (field) { case EXPERIMENT_ID: - return isSetExperimentId(); + return issetExperimentId(); case AIRAVATA_CRED_STORE_TOKEN: return isSetAiravataCredStoreToken(); } @@ -1703,8 +1703,8 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_experimentId = true && this.isSetExperimentId(); - boolean that_present_experimentId = true && that.isSetExperimentId(); + boolean this_present_experimentId = true && this.issetExperimentId(); + boolean that_present_experimentId = true && that.issetExperimentId(); if (this_present_experimentId || that_present_experimentId) { if (!(this_present_experimentId && that_present_experimentId)) return false; @@ -1737,11 +1737,11 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetExperimentId()).compareTo(other.isSetExperimentId()); + lastComparison = Boolean.valueOf(issetExperimentId()).compareTo(other.issetExperimentId()); if (lastComparison != 0) { return lastComparison; } - if (isSetExperimentId()) { + if (issetExperimentId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.experimentId, other.experimentId); if (lastComparison != 0) { return lastComparison; @@ -2373,7 +2373,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public launchTask_args(launchTask_args other) { - if (other.isSetTaskId()) { + if (other.issetTaskId()) { this.taskId = other.taskId; } if (other.isSetAiravataCredStoreToken()) { @@ -2405,7 +2405,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field taskId is set (has been assigned a value) and false otherwise */ - public boolean isSetTaskId() { + public boolean issetTaskId() { return this.taskId != null; } @@ -2480,7 +2480,7 @@ import org.slf4j.LoggerFactory; switch (field) { case TASK_ID: - return isSetTaskId(); + return issetTaskId(); case AIRAVATA_CRED_STORE_TOKEN: return isSetAiravataCredStoreToken(); } @@ -2500,8 +2500,8 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_taskId = true && this.isSetTaskId(); - boolean that_present_taskId = true && that.isSetTaskId(); + boolean this_present_taskId = true && this.issetTaskId(); + boolean that_present_taskId = true && that.issetTaskId(); if (this_present_taskId || that_present_taskId) { if (!(this_present_taskId && that_present_taskId)) return false; @@ -2534,11 +2534,11 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetTaskId()).compareTo(other.isSetTaskId()); + lastComparison = Boolean.valueOf(issetTaskId()).compareTo(other.issetTaskId()); if (lastComparison != 0) { return lastComparison; } - if (isSetTaskId()) { + if (issetTaskId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskId, other.taskId); if (lastComparison != 0) { return lastComparison; @@ -3161,7 +3161,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public validateExperiment_args(validateExperiment_args other) { - if (other.isSetExperimentId()) { + if (other.issetExperimentId()) { this.experimentId = other.experimentId; } } @@ -3189,7 +3189,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field experimentId is set (has been assigned a value) and false otherwise */ - public boolean isSetExperimentId() { + public boolean issetExperimentId() { return this.experimentId != null; } @@ -3229,7 +3229,7 @@ import org.slf4j.LoggerFactory; switch (field) { case EXPERIMENT_ID: - return isSetExperimentId(); + return issetExperimentId(); } throw new IllegalStateException(); } @@ -3247,8 +3247,8 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_experimentId = true && this.isSetExperimentId(); - boolean that_present_experimentId = true && that.isSetExperimentId(); + boolean this_present_experimentId = true && this.issetExperimentId(); + boolean that_present_experimentId = true && that.issetExperimentId(); if (this_present_experimentId || that_present_experimentId) { if (!(this_present_experimentId && that_present_experimentId)) return false; @@ -3272,11 +3272,11 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetExperimentId()).compareTo(other.isSetExperimentId()); + lastComparison = Boolean.valueOf(issetExperimentId()).compareTo(other.issetExperimentId()); if (lastComparison != 0) { return lastComparison; } - if (isSetExperimentId()) { + if (issetExperimentId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.experimentId, other.experimentId); if (lastComparison != 0) { return lastComparison; @@ -3973,7 +3973,7 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public terminateExperiment_args(terminateExperiment_args other) { - if (other.isSetExperimentId()) { + if (other.issetExperimentId()) { this.experimentId = other.experimentId; } if (other.isSetTokenId()) { @@ -4005,7 +4005,7 @@ import org.slf4j.LoggerFactory; } /** Returns true if field experimentId is set (has been assigned a value) and false otherwise */ - public boolean isSetExperimentId() { + public boolean issetExperimentId() { return this.experimentId != null; } @@ -4080,7 +4080,7 @@ import org.slf4j.LoggerFactory; switch (field) { case EXPERIMENT_ID: - return isSetExperimentId(); + return issetExperimentId(); case TOKEN_ID: return isSetTokenId(); } @@ -4100,8 +4100,8 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_experimentId = true && this.isSetExperimentId(); - boolean that_present_experimentId = true && that.isSetExperimentId(); + boolean this_present_experimentId = true && this.issetExperimentId(); + boolean that_present_experimentId = true && that.issetExperimentId(); if (this_present_experimentId || that_present_experimentId) { if (!(this_present_experimentId && that_present_experimentId)) return false; @@ -4134,11 +4134,11 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetExperimentId()).compareTo(other.isSetExperimentId()); + lastComparison = Boolean.valueOf(issetExperimentId()).compareTo(other.issetExperimentId()); if (lastComparison != 0) { return lastComparison; } - if (isSetExperimentId()) { + if (issetExperimentId()) { lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.experimentId, other.experimentId); if (lastComparison != 0) { return lastComparison; http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/model/ExperimentConfigurationData.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/model/ExperimentConfigurationData.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/model/ExperimentConfigurationData.java index 2f17c40..b656f4c 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/model/ExperimentConfigurationData.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/model/ExperimentConfigurationData.java @@ -28,10 +28,10 @@ public class ExperimentConfigurationData { private ResourceScheduling resourceScheduling; private Map<String,Object> inputParameters; private Map<String,Object> outputParameters; - public String getExperimentID() { + public String getExperimentId() { return experimentID; } - public void setExperimentID(String experimentID) { + public void setExperimentId(String experimentID) { this.experimentID = experimentID; } public String getApplicationName() { http://git-wip-us.apache.org/repos/asf/airavata/blob/b376aa85/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java index 66ae987..82a9fc2 100644 --- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java +++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java @@ -69,8 +69,8 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ public boolean launchExperiment(Experiment experiment, WorkflowNodeDetails workflowNode, TaskDetails task,String tokenId) throws OrchestratorException { // we give higher priority to userExperimentID - String experimentId = experiment.getExperimentID(); - String taskId = task.getTaskID(); + String experimentId = experiment.getExperimentId(); + String taskId = task.getTaskId(); // creating monitorID to register with monitoring queue // this is a special case because amqp has to be in place before submitting the job try { @@ -107,7 +107,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ String nodeID = (String) newRegistry.add(ChildDataType.WORKFLOW_NODE_DETAIL, iDontNeedaNode, experimentId); TaskDetails taskDetails = ExperimentModelUtil.cloneTaskFromExperiment(experiment); - taskDetails.setTaskID((String) newRegistry.add(ChildDataType.TASK_DETAIL, taskDetails, nodeID)); + taskDetails.setTaskId((String) newRegistry.add(ChildDataType.TASK_DETAIL, taskDetails, nodeID)); tasks.add(taskDetails); } @@ -140,7 +140,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ } } } - logger.error("Validation of " + validator + " for experiment Id " + experiment.getExperimentID() + " is FAILED:[error]. " + errorMsg); + logger.error("Validation of " + validator + " for experiment Id " + experiment.getExperimentId() + " is FAILED:[error]. " + errorMsg); validationResults.setValidationState(false); try { ErrorDetails details = new ErrorDetails(); @@ -150,7 +150,7 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ details.setCreationTime(Calendar.getInstance().getTimeInMillis()); details.setErrorCategory(ErrorCategory.APPLICATION_FAILURE); orchestratorContext.getNewRegistry().add(ChildDataType.ERROR_DETAIL, details, - taskID.getTaskID()); + taskID.getTaskId()); } catch (RegistryException e) { logger.error("Error while saving error details to registry", e); } @@ -186,11 +186,11 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{ JobState jobState = jobDetails.getJobStatus().getJobState(); if (jobState.getValue() > 4){ logger.error("Cannot cancel the job, because current job state is : " + jobState.toString() + - "jobId: " + jobDetails.getJobID() + " Job Name: " + jobDetails.getJobName()); + "jobId: " + jobDetails.getJobId() + " Job Name: " + jobDetails.getJobName()); return; } } - jobSubmitter.terminate(experiment.getExperimentID(),task.getTaskID(),tokenId); + jobSubmitter.terminate(experiment.getExperimentId(),task.getTaskId(),tokenId); }
