You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2018/06/27 21:13:53 UTC
[airavata] branch staging updated: Fixing the bug of rabbitmq
consumer threads being killed for unhandled exceptions
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/staging by this push:
new aa897d8 Fixing the bug of rabbitmq consumer threads being killed for unhandled exceptions
aa897d8 is described below
commit aa897d80898f774f7edfb6f205446b5a86c310c2
Author: dimuthu <di...@gmail.com>
AuthorDate: Wed Jun 27 17:13:41 2018 -0400
Fixing the bug of rabbitmq consumer threads being killed for unhandled exceptions
---
.../orchestrator/server/OrchestratorServerHandler.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 7f355cf..a49c168 100644
--- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -701,11 +701,13 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
launchExperiment(expEvent.getExperimentId(), expEvent.getGatewayId());
}
} catch (TException e) {
- String logMessage = expEvent.getExperimentId() != null && expEvent.getGatewayId() != null ?
+ String logMessage = expEvent.getExperimentId() != null && expEvent.getGatewayId() != null ?
String.format("Experiment launch failed due to Thrift conversion error, experimentId: %s, gatewayId: %s",
- expEvent.getExperimentId(), expEvent.getGatewayId()): "Experiment launch failed due to Thrift conversion error";
- log.error(logMessage, e);
- throw new RuntimeException("Experiment launch error", e);
+ expEvent.getExperimentId(), expEvent.getGatewayId()) : "Experiment launch failed due to Thrift conversion error";
+ log.error(logMessage, e);
+ } catch (Exception e) {
+ log.error("An unknown issue while launching experiment " + Optional.ofNullable(expEvent.getExperimentId()).orElse("missing experiment") +
+ " on gateway " + Optional.ofNullable(expEvent.getGatewayId()).orElse("missing gateway"), e);
} finally {
experimentSubscriber.sendAck(messageContext.getDeliveryTag());
MDC.clear();