You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/08/23 13:37:16 UTC
[1/2] storm git commit: STORM-3184: Replace the usage of redact-value
with ConfigUtils.maskPasswords
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 <ar...@apache.org>
Authored: Mon Aug 20 16:31:32 2018 -0700
Committer: Arun Mahadevan <ar...@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";
/*
[2/2] storm git commit: Merge branch 'STORM-3184-followup' of
https://github.com/arunmahadevan/storm into STORM-3184-follow-up-1.x
Posted by ka...@apache.org.
Merge branch 'STORM-3184-followup' of https://github.com/arunmahadevan/storm into STORM-3184-follow-up-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b8f2039d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b8f2039d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b8f2039d
Branch: refs/heads/1.x-branch
Commit: b8f2039d64cea990917540f1e0f4a3dacca14db0
Parents: ea84f47 43faecc
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Aug 23 22:37:05 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Aug 23 22:37:05 2018 +0900
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------