You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/09/18 21:36:17 UTC
git commit: removing unwanted sleep
Repository: airavata
Updated Branches:
refs/heads/master 7542f6900 -> 003832ce3
removing unwanted sleep
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/003832ce
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/003832ce
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/003832ce
Branch: refs/heads/master
Commit: 003832ce3b756ae324f1b30f322234021ff6b569
Parents: 7542f69
Author: lahiru <la...@apache.org>
Authored: Thu Sep 18 15:36:13 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Thu Sep 18 15:36:13 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/gfac/core/monitor/MonitorID.java | 6 ------
.../airavata/gfac/monitor/handlers/GridPullMonitorHandler.java | 2 +-
.../airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/003832ce/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 eb30e31..fa77324 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
@@ -193,12 +193,6 @@ public class MonitorID {
// because in some machines job state vanishes quicckly when the job is done
// during that case job state comes as unknown.so we handle it here.
if (this.state != null && status.equals(JobState.UNKNOWN)) {
- try {
- // when state becomes unknown we sleep for a while
- Thread.sleep(10000); // we do not do with this failed count currently because it created more issues.
- } catch (InterruptedException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
int loginfo = getFailedCount() + 1;
logger.info("JobId:" + this.getJobID() + " Increasing the failed count to:" + loginfo + "");
setFailedCount(getFailedCount() + 1);
http://git-wip-us.apache.org/repos/asf/airavata/blob/003832ce/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java
index ff467bf..413e3a8 100644
--- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java
+++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java
@@ -70,7 +70,7 @@ public class GridPullMonitorHandler extends ThreadedHandler implements Watcher{
if(BetterGfacImpl.getMonitorPublisher() != null){
hpcPullMonitor = new HPCPullMonitor(BetterGfacImpl.getMonitorPublisher(),getAuthenticationInfo()); // we use our own credentials for monitoring, not from the store
}else {
- hpcPullMonitor = new HPCPullMonitor(BetterGfacImpl.getMonitorPublisher(),getAuthenticationInfo()); // we use our own credentials for monitoring, not from the store
+ throw new GFacHandlerException("Error initializing Monitor Handler, because Monitor Publisher is null !!!");
}
} catch (ApplicationSettingsException e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
http://git-wip-us.apache.org/repos/asf/airavata/blob/003832ce/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 1ed3c5a..5ea9cee 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
@@ -152,7 +152,7 @@ public class HPCPullMonitor extends PullMonitor {
*
* @return if the start process is successful return true else false
*/
- synchronized public boolean startPulling() throws AiravataMonitorException {
+ public boolean startPulling() throws AiravataMonitorException {
// take the top element in the queue and pull the data and put that element
// at the tail of the queue
//todo this polling will not work with multiple usernames but with single user