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/14 14:24:59 UTC
[4/5] storm git commit: STORM-3184: use shaded guava and remove the
usage of redactValue
STORM-3184: use shaded guava and remove the usage of redactValue
Change-Id: Idb0775f1c1b91cbc648087e7752783f119e034b3
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c12ddb3f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c12ddb3f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c12ddb3f
Branch: refs/heads/master
Commit: c12ddb3f7d6c28a35bd4c90b0df48f48715c3f6e
Parents: 3358eff
Author: Arun Mahadevan <ar...@apache.org>
Authored: Sat Aug 11 21:15:10 2018 -0700
Committer: Arun Mahadevan <ar...@apache.org>
Committed: Sat Aug 11 21:15:10 2018 -0700
----------------------------------------------------------------------
storm-client/pom.xml | 6 ------
storm-client/src/jvm/org/apache/storm/Config.java | 2 ++
.../src/jvm/org/apache/storm/daemon/worker/Worker.java | 3 +--
storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java | 2 +-
.../src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 3 +--
5 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c12ddb3f/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index c925ffd..7c28cce 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -97,12 +97,6 @@
<!-- end of transitive dependency management -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
<!-- test -->
<dependency>
<groupId>org.mockito</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/c12ddb3f/storm-client/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/Config.java b/storm-client/src/jvm/org/apache/storm/Config.java
index 318a130..4582d04 100644
--- a/storm-client/src/jvm/org/apache/storm/Config.java
+++ b/storm-client/src/jvm/org/apache/storm/Config.java
@@ -36,6 +36,7 @@ import org.apache.storm.validation.ConfigValidation.MetricRegistryValidator;
import org.apache.storm.validation.ConfigValidation.MetricReportersValidator;
import org.apache.storm.validation.ConfigValidationAnnotations.CustomValidator;
import org.apache.storm.validation.ConfigValidationAnnotations.NotNull;
+import org.apache.storm.validation.ConfigValidationAnnotations.Password;
import org.apache.storm.validation.ConfigValidationAnnotations.isBoolean;
import org.apache.storm.validation.ConfigValidationAnnotations.isImplementationOfClass;
import org.apache.storm.validation.ConfigValidationAnnotations.isInteger;
@@ -1146,6 +1147,7 @@ public class Config extends HashMap<String, Object> {
* authentication.
*/
@isString
+ @Password
public static final String STORM_ZOOKEEPER_TOPOLOGY_AUTH_PAYLOAD = "storm.zookeeper.topology.auth.payload";
/**
* The cluster Zookeeper authentication scheme to use, e.g. "digest". Defaults to no authentication.
http://git-wip-us.apache.org/repos/asf/storm/blob/c12ddb3f/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
index 9f8428b..816114c 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/Worker.java
@@ -278,8 +278,7 @@ public class Worker implements Shutdownable, DaemonCommon {
setupFlushTupleTimer(topologyConf, newExecutors);
setupBackPressureCheckTimer(topologyConf);
- LOG.info("Worker has topology config {}", Utils.redactValue(ConfigUtils.maskPasswords(topologyConf),
- Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_PAYLOAD));
+ LOG.info("Worker has topology config {}", ConfigUtils.maskPasswords(topologyConf));
LOG.info("Worker {} for storm {} on {}:{} has finished loading", workerId, topologyId, assignmentId, port);
return this;
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c12ddb3f/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java b/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java
index 5fefcea..2219fee 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/ConfigUtils.java
@@ -28,7 +28,7 @@ import java.util.Set;
import java.util.function.BooleanSupplier;
import java.util.stream.Collectors;
-import com.google.common.collect.Maps;
+import org.apache.storm.shade.com.google.common.collect.Maps;
import org.apache.storm.Config;
import org.apache.storm.daemon.supervisor.AdvancedFSOps;
import org.apache.storm.generated.StormTopology;
http://git-wip-us.apache.org/repos/asf/storm/blob/c12ddb3f/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 b66153b..ffb5ab7 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
@@ -3074,8 +3074,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
throw new IllegalArgumentException("The cluster is configured for zookeeper authentication, but no payload was provided.");
}
LOG.info("Received topology submission for {} (storm-{} JDK-{}) with conf {}", topoName,
- topoVersionString, topology.get_jdk_version(),
- Utils.redactValue(ConfigUtils.maskPasswords(topoConf), Config.STORM_ZOOKEEPER_TOPOLOGY_AUTH_PAYLOAD));
+ topoVersionString, topology.get_jdk_version(), ConfigUtils.maskPasswords(topoConf));
// lock protects against multiple topologies being submitted at once and
// cleanup thread killing topology in b/w assignment and starting the topology