You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sa...@apache.org on 2017/08/31 08:43:53 UTC

storm git commit: STORM-2443 Fix issues on changing log level

Repository: storm
Updated Branches:
  refs/heads/master e1dd247ce -> 9d62c13aa


STORM-2443 Fix issues on changing log level

* Addressed below issues
  * Nimbus throws error when changing log level on UI topology page
  * Log configs in worker are removed even they're not timed out and never reset
  * The unit of epoch between backend and frontend are different
    * second in backend, millisecond in frontend
    * millisecond is right so fixed it


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9d62c13a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9d62c13a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9d62c13a

Branch: refs/heads/master
Commit: 9d62c13aad92daffa6af483306af35fc5609d89d
Parents: e1dd247
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Aug 30 22:59:13 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Aug 31 12:11:57 2017 +0900

----------------------------------------------------------------------
 .../storm/daemon/worker/LogConfigManager.java   | 13 +++---
 .../daemon/worker/LogConfigManagerTest.java     | 42 ++++++++++++++++++++
 .../org/apache/storm/daemon/nimbus/Nimbus.java  | 13 +++---
 3 files changed, 58 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/9d62c13a/storm-client/src/jvm/org/apache/storm/daemon/worker/LogConfigManager.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/LogConfigManager.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/LogConfigManager.java
index 00fccf9..c900580 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/worker/LogConfigManager.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/LogConfigManager.java
@@ -111,6 +111,9 @@ public class LogConfigManager {
     // also called from processLogConfigChange
     public void resetLogLevels() {
         TreeMap<String, LogLevel> latestLogLevelMap = latestLogConfig.get();
+
+        LOG.debug("Resetting log levels: Latest log config is {}", latestLogLevelMap);
+
         LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false);
 
         for (String loggerName : latestLogLevelMap.descendingKeySet()) {
@@ -120,12 +123,12 @@ public class LogConfigManager {
             if (timeout < Time.currentTimeMillis()) {
                 LOG.info("{}: Resetting level to {}", loggerName, resetLogLevel);
                 setLoggerLevel(loggerContext, loggerName, resetLogLevel);
+                latestLogConfig.getAndUpdate(input -> {
+                    TreeMap<String, LogLevel> result = new TreeMap<>(input);
+                    result.remove(loggerName);
+                    return result;
+                });
             }
-            latestLogConfig.getAndUpdate(input -> {
-                TreeMap<String, LogLevel> result = new TreeMap<>(input);
-                result.remove(loggerName);
-                return result;
-            });
         }
         loggerContext.updateLoggers();
     }

http://git-wip-us.apache.org/repos/asf/storm/blob/9d62c13a/storm-client/test/jvm/org/apache/storm/daemon/worker/LogConfigManagerTest.java
----------------------------------------------------------------------
diff --git a/storm-client/test/jvm/org/apache/storm/daemon/worker/LogConfigManagerTest.java b/storm-client/test/jvm/org/apache/storm/daemon/worker/LogConfigManagerTest.java
index 95491a4..e8259e0 100644
--- a/storm-client/test/jvm/org/apache/storm/daemon/worker/LogConfigManagerTest.java
+++ b/storm-client/test/jvm/org/apache/storm/daemon/worker/LogConfigManagerTest.java
@@ -20,6 +20,7 @@ package org.apache.storm.daemon.worker;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
+import java.util.Collections;
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -132,6 +133,47 @@ public class LogConfigManagerTest {
             verify(underTest).setLoggerLevel(anyObject(), eq(LogManager.ROOT_LOGGER_NAME), eq("WARN"));
         }
     }
+
+    @Test
+    public void testLogResetProperlyResetLogLevelAfterTimeout() throws InterruptedException {
+        try (SimulatedTime t = new SimulatedTime()){
+            long inThirtySeconds = Time.currentTimeMillis() + 30_000;
+            TreeMap<String, LogLevel> config = new TreeMap<>();
+            config.put(LogManager.ROOT_LOGGER_NAME, ll("DEBUG", "WARN", inThirtySeconds));
+            AtomicReference<TreeMap<String, LogLevel>> atomConf = new AtomicReference<>(config);
+
+            LogConfigManager underTest = spy(new LogConfigManagerUnderTest(atomConf));
+
+            TreeMap<String, LogLevel> expected = new TreeMap<>();
+            LogLevel logLevel = new LogLevel(LogLevelAction.UPDATE);
+            logLevel.set_target_log_level("DEBUG");
+            logLevel.set_reset_log_level("WARN");
+            logLevel.set_reset_log_level_timeout_epoch(30_000);
+            expected.put(LogManager.ROOT_LOGGER_NAME, logLevel);
+
+            underTest.resetLogLevels();
+            assertEquals(expected, atomConf.get());
+            verify(underTest, never()).setLoggerLevel(anyObject(), eq(LogManager.ROOT_LOGGER_NAME), anyString());
+
+            // 11 seconds passed by, not timing out
+            Time.advanceTimeSecs(11);
+            underTest.resetLogLevels();
+            assertEquals(expected, atomConf.get());
+            verify(underTest, never()).setLoggerLevel(anyObject(), eq(LogManager.ROOT_LOGGER_NAME), anyString());
+
+            // 22 seconds passed by, still not timing out
+            Time.advanceTimeSecs(11);
+            underTest.resetLogLevels();
+            assertEquals(expected, atomConf.get());
+            verify(underTest, never()).setLoggerLevel(anyObject(), eq(LogManager.ROOT_LOGGER_NAME), anyString());
+
+            // 33 seconds passed by, timed out
+            Time.advanceTimeSecs(11);
+            underTest.resetLogLevels();
+            assertEquals(new TreeMap<>(), atomConf.get());
+            verify(underTest).setLoggerLevel(anyObject(), eq(LogManager.ROOT_LOGGER_NAME), eq("WARN"));
+        }
+    }
     
     @Test
     public void testLogResetsNamedLoggersWithPastTimeout() {

http://git-wip-us.apache.org/repos/asf/storm/blob/9d62c13a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
index fb2c3e1..d702b47 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -903,7 +903,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
     private static void setLoggerTimeouts(LogLevel level) {
         int timeoutSecs = level.get_reset_log_level_timeout_secs();
         if (timeoutSecs > 0) {
-            level.set_reset_log_level_timeout_epoch(Time.currentTimeSecs() + timeoutSecs);
+            level.set_reset_log_level_timeout_epoch(Time.currentTimeMillis() + Time.secsToMillis(timeoutSecs));
         } else {
             level.unset_reset_log_level_timeout_epoch();
         }
@@ -2752,11 +2752,14 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
             if (mergedLogConfig == null) {
                 mergedLogConfig = new LogConfig();
             }
-            Map<String, LogLevel> namedLoggers = mergedLogConfig.get_named_logger_level();
-            for (LogLevel level: namedLoggers.values()) {
-                level.set_action(LogLevelAction.UNCHANGED);
+
+            if (mergedLogConfig.is_set_named_logger_level()) {
+                Map<String, LogLevel> namedLoggers = mergedLogConfig.get_named_logger_level();
+                for (LogLevel level: namedLoggers.values()) {
+                    level.set_action(LogLevelAction.UNCHANGED);
+                }
             }
-            
+
             if (config.is_set_named_logger_level()) {
                 for (Entry<String, LogLevel> entry: config.get_named_logger_level().entrySet()) {
                     LogLevel logConfig = entry.getValue();