You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/06/10 17:47:44 UTC

airavata git commit: Added logs before do acknowledgements

Repository: airavata
Updated Branches:
  refs/heads/airavata-0.15-release-branch 1cf6bd32b -> 14044de5d


Added logs before do acknowledgements


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

Branch: refs/heads/airavata-0.15-release-branch
Commit: 14044de5d76ddeb606b4dc4c14d6f2f6c4db9085
Parents: 1cf6bd3
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Wed Jun 10 11:47:37 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Wed Jun 10 11:47:37 2015 -0400

----------------------------------------------------------------------
 .../api/server/listener/AiravataExperimentStatusUpdator.java       | 2 ++
 .../java/org/apache/airavata/gfac/server/GfacServerHandler.java    | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/14044de5/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
index f59179e..6a6c721 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
@@ -140,6 +140,7 @@ public class AiravataExperimentStatusUpdator implements AbstractActivityListener
                 }
                 try {
                     if (consumer.isOpen()) {
+                        logger.info("Clean up task - Acknowledging delivery Tag - " + deliveryTag);
                         consumer.sendAck(deliveryTag);
                     }
                 } catch (Exception e) {
@@ -170,6 +171,7 @@ public class AiravataExperimentStatusUpdator implements AbstractActivityListener
             }
             try {
                 if (consumer.isOpen()) {
+                    logger.info("Clean up task - Acknowledging cancel delivery Tag - " + deliveryTag);
                     consumer.sendAck(cancelDT);
                 }
             } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/14044de5/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 dd85368..0bb7b60 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
@@ -331,6 +331,7 @@ public class GfacServerHandler implements GfacService.Iface {
                     } catch (Exception e) {
                         logger.error(e.getMessage(), e);
                         String experimentPath = experimentNode + File.separator + nodeName + File.separator + event.getExperimentId();
+                        logger.info("GFacServerHandler Launchtask - Acknowledging delivery Tag - " + message.getDeliveryTag());
                         rabbitMQTaskLaunchConsumer.sendAck(message.getDeliveryTag());
                         try {
                             if (curatorClient.checkExists().forPath(experimentPath + AiravataZKUtils.DELIVERY_TAG_POSTFIX) != null) {
@@ -377,6 +378,7 @@ public class GfacServerHandler implements GfacService.Iface {
                                 if (!rabbitMQTaskLaunchConsumer.isOpen()) {
                                     rabbitMQTaskLaunchConsumer.reconnect();
                                 }
+                                logger.info("GFacServerHandler TerminateTask - Acknowledging cancel delivery Tag - " + message.getDeliveryTag());
                                 rabbitMQTaskLaunchConsumer.sendAck(message.getDeliveryTag());
                             }
                         } catch (Exception e) {