airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject airavata git commit: Remove operation node in zookeeper for each experiment.
Date Wed, 13 May 2015 15:25:38 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 246d55b86 -> 4a38f819a


Remove operation node in zookeeper for each experiment.


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

Branch: refs/heads/master
Commit: 4a38f819abae1de0c4d08d1a908d712e97bdbe5a
Parents: 246d55b
Author: shamrath <shameerainfo@gmail.com>
Authored: Wed May 13 11:25:36 2015 -0400
Committer: shamrath <shameerainfo@gmail.com>
Committed: Wed May 13 11:25:36 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java   | 2 --
 .../airavata/gfac/monitor/handlers/GridPullMonitorHandler.java   | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/4a38f819/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index 5f0b1a1..2530b35 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@ -489,8 +489,6 @@ public class BetterGfacImpl implements GFac,Watcher {
         // we need to setup workflow tracking listerner.
         try {
             String experimentEntry = GFacUtils.findExperimentEntry(jobExecutionContext.getExperimentID(),
zk);
-            Stat exists = zk.exists(experimentEntry + File.separator + "operation", false);
-            zk.getData(experimentEntry + File.separator + "operation", this, exists);
             GfacExperimentState gfacExpState = GFacUtils.getZKExperimentState(zk, jobExecutionContext);
  // this is the original state came, if we query again it might be different,so we preserve
this state in the environment
             monitorPublisher.publish(new GfacExperimentStateChangeRequest(new MonitorID(jobExecutionContext)
                     , GfacExperimentState.ACCEPTED));                  // immediately we
get the request we update the status

http://git-wip-us.apache.org/repos/asf/airavata/blob/4a38f819/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 6fff840..2476c85 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
@@ -87,7 +87,7 @@ public class GridPullMonitorHandler extends ThreadedHandler implements Watcher{
         hpcPullMonitor.setGfac(jobExecutionContext.getGfac());
         MonitorID monitorID = new HPCMonitorID(getAuthenticationInfo(), jobExecutionContext);
         try {
-            ZooKeeper zk = jobExecutionContext.getZk();
+           /* ZooKeeper zk = jobExecutionContext.getZk();
             try {
                 String experimentEntry = GFacUtils.findExperimentEntry(jobExecutionContext.getExperimentID(),
zk);
                 String path = experimentEntry + File.separator + "operation";
@@ -99,7 +99,7 @@ public class GridPullMonitorHandler extends ThreadedHandler implements Watcher{
                 logger.error(e.getMessage(), e);
             } catch (InterruptedException e) {
                 logger.error(e.getMessage(), e);
-            }
+            }*/
             CommonUtils.addMonitortoQueue(hpcPullMonitor.getQueue(), monitorID, jobExecutionContext);
             CommonUtils.increaseZkJobCount(monitorID); // update change job count to zookeeper
         } catch (AiravataMonitorException e) {


Mime
View raw message