merging
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fa666b30 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fa666b30 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fa666b30 Branch: refs/heads/gfac_appcatalog_int Commit: fa666b30ce5c3408b43cb5616c99d4d3d17a3b51 Parents: d856d24 Author: Chathuri Wimalasena <[email protected]> Authored: Wed Nov 5 13:19:50 2014 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Wed Nov 5 13:19:50 2014 -0500 ---------------------------------------------------------------------- .../airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 5 ----- .../airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java | 4 ---- 2 files changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/fa666b30/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java index 122d1e2..331663f 100644 --- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java +++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java @@ -35,16 +35,12 @@ import org.apache.airavata.gfac.monitor.UserMonitorData; import org.apache.airavata.gfac.monitor.core.PullMonitor; import org.apache.airavata.gfac.monitor.exception.AiravataMonitorException; import org.apache.airavata.gfac.monitor.impl.push.amqp.SimpleJobFinishConsumer; -import org.apache.airavata.gfac.monitor.util.CommonUtils; import org.apache.airavata.gsi.ssh.api.SSHApiException; import org.apache.airavata.gsi.ssh.api.authentication.AuthenticationInfo; import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol; import org.apache.airavata.model.messaging.event.JobIdentifier; import org.apache.airavata.model.messaging.event.JobStatusChangeRequestEvent; import org.apache.airavata.model.workspace.experiment.JobState; -import org.apache.airavata.schemas.gfac.GsisshHostType; -import org.apache.airavata.schemas.gfac.SSHHostType; -import org.apache.zookeeper.ZooKeeper; import java.sql.Timestamp; import java.util.*; @@ -239,7 +235,6 @@ public class HPCPullMonitor extends PullMonitor { !JobState.COMPLETE.equals(iMonitorID.getStatus())) { 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())){ - completedJobs.put(iMonitorID.getJobName(), iMonitorID); logger.debugId(iMonitorID.getJobID(), "Moved job {} to completed jobs map, experiment {}, " + "task {}", iMonitorID.getJobID(), iMonitorID.getExperimentID(), iMonitorID.getTaskID()); iterator.remove(); http://git-wip-us.apache.org/repos/asf/airavata/blob/fa666b30/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 f508e23..f34b82a 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 @@ -110,10 +110,6 @@ public class AdvancedSCPOutputHandler extends AbstractHandler { this.passPhrase); } try { - ApplicationDeploymentDescriptionType app = jobExecutionContext.getApplicationContext() - .getApplicationDeploymentDescription().getType(); - String standardError = app.getStandardError(); - String standardOutput = app.getStandardOutput(); if (jobExecutionContext.getSecurityContext(SSHSecurityContext.SSH_SECURITY_CONTEXT) == null) { try { GFACSSHUtils.addSecurityContext(jobExecutionContext);
