Repository: airavata Updated Branches: refs/heads/airavata-0.15-release-branch 4133c5b04 -> c3a8b77d6
Added zookeeper node delete after sendAck Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/815a2681 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/815a2681 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/815a2681 Branch: refs/heads/airavata-0.15-release-branch Commit: 815a268194e8ecb6acf0d79724a575cedb1abfb4 Parents: 59e36d8 Author: Shameera Rathanyaka <[email protected]> Authored: Tue Jun 9 17:55:29 2015 -0400 Committer: Shameera Rathanyaka <[email protected]> Committed: Tue Jun 9 17:55:29 2015 -0400 ---------------------------------------------------------------------- .../airavata/gfac/server/GfacServerHandler.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/815a2681/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java index 20926d7..dd85368 100644 --- a/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java +++ b/modules/gfac/airavata-gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java @@ -57,6 +57,7 @@ import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; +import org.apache.curator.utils.ZKPaths; import org.apache.thrift.TBase; import org.apache.thrift.TException; import org.apache.zookeeper.CreateMode; @@ -329,7 +330,20 @@ public class GfacServerHandler implements GfacService.Iface { submitJob(event.getExperimentId(), event.getTaskId(), event.getGatewayId(), event.getTokenId()); } catch (Exception e) { logger.error(e.getMessage(), e); + String experimentPath = experimentNode + File.separator + nodeName + File.separator + event.getExperimentId(); rabbitMQTaskLaunchConsumer.sendAck(message.getDeliveryTag()); + try { + if (curatorClient.checkExists().forPath(experimentPath + AiravataZKUtils.DELIVERY_TAG_POSTFIX) != null) { + ZKPaths.deleteChildren(curatorClient.getZookeeperClient().getZooKeeper(), + experimentPath + AiravataZKUtils.DELIVERY_TAG_POSTFIX, true); + } + + if (curatorClient.checkExists().forPath(experimentPath) != null) { + ZKPaths.deleteChildren(curatorClient.getZookeeperClient().getZooKeeper(), experimentPath, true); + } + } catch (Exception e1) { + logger.error("Error while deleting experiment node in zookeeper, expId : {}" , experimentPath); + } } } catch (TException e) { logger.error(e.getMessage(), e); //nobody is listening so nothing to throw
