storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [1/2] storm git commit: STORM-3184: Replace the usage of redact-value with ConfigUtils.maskPasswords
Date Thu, 23 Aug 2018 13:37:16 GMT
Repository: storm
Updated Branches:
  refs/heads/1.x-branch ea84f47e1 -> b8f2039d6


STORM-3184: Replace the usage of redact-value with ConfigUtils.maskPasswords

The topology submission can fail since redact-value
expects a clojure map. We dont need redact-value, it can be replaced
with just ConfigUtils.maskPasswords. This is already done in master.


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

Branch: refs/heads/1.x-branch
Commit: 43faecc870468a00d5f1b2d5ba1c5c4274ae77b0
Parents: fc942ee
Author: Arun Mahadevan <arunm@apache.org>
Authored: Mon Aug 20 16:31:32 2018 -0700
Committer: Arun Mahadevan <arunm@apache.org>
Committed: Tue Aug 21 15:36:18 2018 -0700

----------------------------------------------------------------------
 storm-core/src/clj/org/apache/storm/daemon/nimbus.clj | 2 +-
 storm-core/src/clj/org/apache/storm/daemon/worker.clj | 2 +-
 storm-core/src/jvm/org/apache/storm/Config.java       | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/43faecc8/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
index fc89ac4..e89fc9e 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
@@ -1748,7 +1748,7 @@
                        " (storm-" (.get_storm_version topology)
                        " JDK-" (.get_jdk_version topology)
                        ") with conf "
-                       (redact-value (ConfigUtils/maskPasswords storm-conf) STORM-ZOOKEEPER-TOPOLOGY-AUTH-PAYLOAD))
+                       (ConfigUtils/maskPasswords storm-conf))
           ;; lock protects against multiple topologies being submitted at once and
           ;; cleanup thread killing topology in b/w assignment and starting the topology
           (locking (:submit-lock nimbus)

http://git-wip-us.apache.org/repos/asf/storm/blob/43faecc8/storm-core/src/clj/org/apache/storm/daemon/worker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/worker.clj b/storm-core/src/clj/org/apache/storm/daemon/worker.clj
index 13daa10..52b4af1 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/worker.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/worker.clj
@@ -778,7 +778,7 @@
     (schedule-recurring (:reset-log-levels-timer worker) 0 (conf WORKER-LOG-LEVEL-RESET-POLL-SECS)
(fn [] (reset-log-levels latest-log-config)))
     (schedule-recurring (:refresh-active-timer worker) 0 (conf TASK-REFRESH-POLL-SECS) (partial
refresh-storm-active worker))
 
-    (log-message "Worker has topology config " (redact-value (ConfigUtils/maskPasswords (:storm-conf
worker)) STORM-ZOOKEEPER-TOPOLOGY-AUTH-PAYLOAD))
+    (log-message "Worker has topology config " (ConfigUtils/maskPasswords (:storm-conf worker)))
     (log-message "Worker " worker-id " for storm " storm-id " on " assignment-id ":" port
" has finished loading")
     ret
     ))))))

http://git-wip-us.apache.org/repos/asf/storm/blob/43faecc8/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/Config.java b/storm-core/src/jvm/org/apache/storm/Config.java
index fc9fb55..4849b97 100644
--- a/storm-core/src/jvm/org/apache/storm/Config.java
+++ b/storm-core/src/jvm/org/apache/storm/Config.java
@@ -412,6 +412,7 @@ public class Config extends HashMap<String, Object> {
      * A string representing the payload for topology Zookeeper authentication. It gets serialized
using UTF-8 encoding during authentication.
      */
     @isString
+    @Password
     public static final String STORM_ZOOKEEPER_TOPOLOGY_AUTH_PAYLOAD="storm.zookeeper.topology.auth.payload";
 
     /*


Mime
View raw message