[airavata] branch staging updated: Removing task failure when a job cancellation is failed

[dimuthuupe]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/staging by this push:
     new 23631de  Removing task failure when a job cancellation is failed
23631de is described below

commit 23631de8140ef0d74c95cfaf5eeb4228e800a037
Author: Dimuthu Wannipurage <dimuthu.wannipur...@datasprouts.com>
AuthorDate: Thu Nov 1 22:55:50 2018 -0400

    Removing task failure when a job cancellation is failed
---
 .../airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
 
b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
index 889a09d..7acc506 100644
--- 
a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
+++ 
b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
@@ -108,10 +108,10 @@ public class RemoteJobCancellationTask extends 
AiravataTask {
                     CommandOutput jobCancelOutput = 
adaptor.executeCommand(cancelCommand.getRawCommand(), null);
 
                     if (jobCancelOutput.getExitCode() != 0) {
-                        logger.error("Failed to execute job cancellation 
command for job " + jobId + " Sout : " +
+                        logger.warn("Failed to execute job cancellation 
command for job " + jobId + " Sout : " +
                                 jobCancelOutput.getStdOut() + ", Serr : " + 
jobCancelOutput.getStdError());
-                        return onFail("Failed to execute job cancellation 
command for job " + jobId + " Sout : " +
-                                jobCancelOutput.getStdOut() + ", Serr : " + 
jobCancelOutput.getStdError(), true, null);
+                        //return onFail("Failed to execute job cancellation 
command for job " + jobId + " Sout : " +
+                        //        jobCancelOutput.getStdOut() + ", Serr : " + 
jobCancelOutput.getStdError(), true, null);
                     }
                 } catch (Exception ex) {
                     logger.error("Unknown error while canceling job " + jobId 
+ " of process " + getProcessId());