airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject git commit: adding the monitoring object back to the queue when exception is thrown
Date Thu, 02 Oct 2014 18:07:46 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 3cca77d0a -> af6b9d513


adding the monitoring object back to the queue when exception is thrown


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/af6b9d51
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/af6b9d51
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/af6b9d51

Branch: refs/heads/master
Commit: af6b9d51362c190c706baa034dfd15be08bfe2af
Parents: 3cca77d
Author: lahiru <lahiru@apache.org>
Authored: Thu Oct 2 14:06:57 2014 -0400
Committer: lahiru <lahiru@apache.org>
Committed: Thu Oct 2 14:06:57 2014 -0400

----------------------------------------------------------------------
 .../monitor/impl/pull/qstat/HPCPullMonitor.java | 23 ++++++++------------
 1 file changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/af6b9d51/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 668812a..855a8d2 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
@@ -326,22 +326,17 @@ public class HPCPullMonitor extends PullMonitor {
                     }
                 }
             }
+            try {
+                queue.put(take);
+            } catch (InterruptedException e1) {
+                e1.printStackTrace();
+            }
             throw new AiravataMonitorException("Error retrieving the job status", e);
         } catch (Exception e) {
-            if (currentMonitorID != null) {
-                if (currentMonitorID.getFailedCount() < 3) {
-                    try {
-                        currentMonitorID.setFailedCount(currentMonitorID.getFailedCount()
+ 1);
-                        this.queue.put(take);
-                        // if we get a wrong status we wait for a while and request again
-                        Thread.sleep(10000);
-                    } catch (InterruptedException e1) {
-                        e1.printStackTrace();
-                    }
-                } else {
-                    logger.error(e.getMessage());
-                    logger.error("Tryied to monitor the job 3 times, so dropping of the the
Job with ID: " + currentMonitorID.getJobID());
-                }
+            try {
+                queue.put(take);
+            } catch (InterruptedException e1) {
+                e1.printStackTrace();
             }
             throw new AiravataMonitorException("Error retrieving the job status", e);
         }


Mime
View raw message