You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/09/20 17:51:15 UTC
[2/3] storm git commit: STORM-3230: Addressed review comments
STORM-3230: Addressed review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f89349ca
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f89349ca
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f89349ca
Branch: refs/heads/master
Commit: f89349ca83662d088f02a3ea1382109982d8cf06
Parents: 8390713
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Sep 19 13:54:12 2018 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Sep 19 13:54:12 2018 -0500
----------------------------------------------------------------------
.../jvm/org/apache/storm/cluster/StormClusterStateImpl.java | 6 +++---
.../storm/security/auth/workertoken/WorkerTokenAuthorizer.java | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f89349ca/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java b/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
index 1468868..644f465 100644
--- a/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
+++ b/storm-client/src/jvm/org/apache/storm/cluster/StormClusterStateImpl.java
@@ -856,7 +856,7 @@ public class StormClusterStateImpl implements IStormClusterState {
stateStorage.mkdirs(ClusterUtils.SECRET_KEYS_SUBTREE, defaultAcls);
List<ACL> secretAcls = context.getZkSecretAcls(type);
String path = ClusterUtils.secretKeysPath(type, topologyId, keyVersion);
- LOG.debug("Storing private key for {} connecting to a {} at {} with ACL {}\n\n", topologyId, type, path, secretAcls);
+ LOG.info("Storing private key for {} connecting to a {} at {} with ACL {}", topologyId, type, path, secretAcls);
stateStorage.set_data(path, Utils.serialize(key), secretAcls);
}
@@ -886,7 +886,7 @@ public class StormClusterStateImpl implements IStormClusterState {
PrivateWorkerKey key =
ClusterUtils.maybeDeserialize(stateStorage.get_data(fullPath, false), PrivateWorkerKey.class);
if (Time.currentTimeMillis() > key.get_expirationTimeMillis()) {
- LOG.debug("Removing expired worker key {}", fullPath);
+ LOG.info("Removing expired worker key {}", fullPath);
stateStorage.delete_node(fullPath);
}
} catch (RuntimeException e) {
@@ -911,7 +911,7 @@ public class StormClusterStateImpl implements IStormClusterState {
for (WorkerTokenServiceType type : WorkerTokenServiceType.values()) {
String path = ClusterUtils.secretKeysPath(type, topologyId);
try {
- LOG.debug("Removing worker keys under {}", path);
+ LOG.info("Removing worker keys under {}", path);
stateStorage.delete_node(path);
} catch (RuntimeException e) {
//This should never happen because only the primary nimbus is active, but just in case
http://git-wip-us.apache.org/repos/asf/storm/blob/f89349ca/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java b/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
index 3919cb7..fcc5eeb 100644
--- a/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
+++ b/storm-client/src/jvm/org/apache/storm/security/auth/workertoken/WorkerTokenAuthorizer.java
@@ -99,7 +99,8 @@ public class WorkerTokenAuthorizer implements PasswordProvider {
try {
key = keyCache.getUnchecked(deser);
} catch (CacheLoader.InvalidCacheLoadException e) {
- //This happens when the cache has a null returned to it.
+ //This happens when the key is not found, the cache loader returns a null and this exception is thrown.
+ // because the cache cannot store a null.
throw new IllegalArgumentException("Token is not valid, private key not found.", e);
}