You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by et...@apache.org on 2020/02/03 15:57:30 UTC
[storm] branch master updated: [STORM-3571] add topo id to log when
handle running dynamic state
This is an automated email from the ASF dual-hosted git repository.
ethanli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new 2f9c3d5 [STORM-3571] add topo id to log when handle running dynamic state
new 36204ed Merge pull request #3201 from RuiLi8080/STORM-3571
2f9c3d5 is described below
commit 2f9c3d57d33cf9c57a03db343da307abe3e48d28
Author: Rui Li <ru...@verizonmedia.com>
AuthorDate: Thu Jan 30 15:39:50 2020 -0600
[STORM-3571] add topo id to log when handle running dynamic state
---
.../main/java/org/apache/storm/daemon/supervisor/Slot.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
index 85e5f9a..de29ace 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
@@ -803,18 +803,21 @@ public class Slot extends Thread implements AutoCloseable, BlobChangingCallback
}
if (dynamicState.container.didMainProcessExit()) {
- LOG.warn("SLOT {}: main process has exited", staticState.port);
+ LOG.warn("SLOT {}: main process has exited for topology: {}",
+ staticState.port, dynamicState.currentAssignment.get_topology_id());
return killContainerFor(KillReason.PROCESS_EXIT, dynamicState, staticState);
}
if (dynamicState.container.isMemoryLimitViolated(dynamicState.currentAssignment)) {
- LOG.warn("SLOT {}: violated memory limits", staticState.port);
+ LOG.warn("SLOT {}: violated memory limits for topology: {}",
+ staticState.port, dynamicState.currentAssignment.get_topology_id());
return killContainerFor(KillReason.MEMORY_VIOLATION, dynamicState, staticState);
}
LSWorkerHeartbeat hb = dynamicState.container.readHeartbeat();
if (hb == null) {
- LOG.warn("SLOT {}: HB returned as null", staticState.port);
+ LOG.warn("SLOT {}: HB returned as null for topology: {}",
+ staticState.port, dynamicState.currentAssignment.get_topology_id());
//This can happen if the supervisor crashed after launching a
// worker that never came up.
return killContainerFor(KillReason.HB_NULL, dynamicState, staticState);
@@ -823,7 +826,8 @@ public class Slot extends Thread implements AutoCloseable, BlobChangingCallback
long timeDiffMs = (Time.currentTimeSecs() - hb.get_time_secs()) * 1000;
long hbTimeoutMs = getHbTimeoutMs(staticState, dynamicState);
if (timeDiffMs > hbTimeoutMs) {
- LOG.warn("SLOT {}: HB is too old {} > {}", staticState.port, timeDiffMs, hbTimeoutMs);
+ LOG.warn("SLOT {}: HB is too old {} > {} for topology: {}",
+ staticState.port, timeDiffMs, hbTimeoutMs, dynamicState.currentAssignment.get_topology_id());
return killContainerFor(KillReason.HB_TIMEOUT, dynamicState, staticState);
}