[storm] branch master updated: [STORM-3649] fix logic error regarding storm.supervisor.medium.memory.grace.period.ms

[et...@apache.org]

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 0ceecaf  [STORM-3649] fix logic error regarding storm.supervisor.medium.memory.grace.period.ms
     new 16e92e7  Merge pull request #3282 from Ethanlm/STORM-3649
0ceecaf is described below

commit 0ceecaf3d08bee8e166ef47d2471688e17217e6a
Author: Ethan Li <et...@gmail.com>
AuthorDate: Mon Jun 8 15:48:14 2020 -0500

    [STORM-3649] fix logic error regarding storm.supervisor.medium.memory.grace.period.ms
---
 .../main/java/org/apache/storm/daemon/supervisor/BasicContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
index 4db6f3f..5383d65 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/BasicContainer.java
@@ -77,7 +77,7 @@ public class BasicContainer extends Container {
     protected final long mediumMemoryGracePeriodMs;
     protected volatile boolean exitedEarly = false;
     protected volatile long memoryLimitMb;
-    protected volatile long memoryLimitExceededStart;
+    protected volatile long memoryLimitExceededStart = -1;
 
     /**
      * Create a new BasicContainer.