Repository: storm Updated Branches: refs/heads/master 339b1e6f3 -> 41dd0a7b3
STORM-3303 adjust some logging priorities, log topology info Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/abca1540 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/abca1540 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/abca1540 Branch: refs/heads/master Commit: abca1540be9e6875f93dc0b9a276710717bc0ff6 Parents: f5b3f93 Author: Aaron Gresch <agre...@yahoo-inc.com> Authored: Tue Dec 11 14:18:23 2018 -0600 Committer: Aaron Gresch <agre...@yahoo-inc.com> Committed: Tue Dec 11 14:18:23 2018 -0600 ---------------------------------------------------------------------- .../jvm/org/apache/storm/pacemaker/PacemakerClient.java | 2 +- .../utils/StormBoundedExponentialBackoffRetry.java | 4 ++-- .../java/org/apache/storm/daemon/nimbus/Nimbus.java | 12 ++++++------ .../org/apache/storm/daemon/supervisor/Supervisor.java | 2 +- .../security/auth/workertoken/WorkerTokenManager.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/abca1540/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java index 5390a2c..e01c7c0 100644 --- a/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java +++ b/storm-client/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java @@ -187,7 +187,7 @@ public class PacemakerClient implements ISaslClient { throw new PacemakerConnectionException("couldn't get response after " + maxRetries + " attempts."); } retry--; - LOG.error("Not getting response or getting null response. Making {} more attempts for {}.", retry, host); + LOG.warn("Not getting response or getting null response. Making {} more attempts for {}.", retry, host); } } } http://git-wip-us.apache.org/repos/asf/storm/blob/abca1540/storm-client/src/jvm/org/apache/storm/utils/StormBoundedExponentialBackoffRetry.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/utils/StormBoundedExponentialBackoffRetry.java b/storm-client/src/jvm/org/apache/storm/utils/StormBoundedExponentialBackoffRetry.java index 768c83c..969a9c6 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/StormBoundedExponentialBackoffRetry.java +++ b/storm-client/src/jvm/org/apache/storm/utils/StormBoundedExponentialBackoffRetry.java @@ -57,13 +57,13 @@ public class StormBoundedExponentialBackoffRetry extends BoundedExponentialBacko int exp = 1 << retryCount; int jitter = random.nextInt(exp); long sleepTimeMs = super.getBaseSleepTimeMs() + exp + jitter; - LOG.warn("WILL SLEEP FOR {}ms (NOT MAX)", sleepTimeMs); + LOG.debug("WILL SLEEP FOR {}ms (NOT MAX)", sleepTimeMs); return sleepTimeMs; } else { int stepJitter = random.nextInt(stepSize); long sleepTimeMs = Math.min(super.getMaxSleepTimeMs(), (linearBaseSleepMs + (stepSize * (retryCount - expRetriesThreshold)) + stepJitter)); - LOG.warn("WILL SLEEP FOR {}ms (MAX)", sleepTimeMs); + LOG.debug("WILL SLEEP FOR {}ms (MAX)", sleepTimeMs); return sleepTimeMs; } } http://git-wip-us.apache.org/repos/asf/storm/blob/abca1540/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 9568c04..90d43aa 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 @@ -1682,9 +1682,9 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon { && codeCount < minReplicationCount && confCount < minReplicationCount) { if (maxWaitTime > 0 && totalWaitTime > maxWaitTime) { - LOG.info("desired replication count of {} not achieved but we have hit the max wait time {}" + LOG.info("desired replication count of {} not achieved for {} but we have hit the max wait time {}" + " so moving on with replication count for conf key = {} for code key = {} for jar key = ", - minReplicationCount, maxWaitTime, confCount, codeCount, jarCount); + minReplicationCount, topoId, maxWaitTime, confCount, codeCount, jarCount); return; } LOG.debug("Checking if I am still the leader"); @@ -1700,9 +1700,9 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon { confCount = getBlobReplicationCount(ConfigUtils.masterStormConfKey(topoId)); } } - LOG.info("desired replication count {} achieved, current-replication-count for conf key = {}," + LOG.info("desired replication count {} achieved for topology {}, current-replication-count for conf key = {}," + " current-replication-count for code key = {}, current-replication-count for jar key = {}", - minReplicationCount, confCount, codeCount, jarCount); + minReplicationCount, topoId, confCount, codeCount, jarCount); } private TopologyDetails readTopologyDetails(String topoId, StormBase base) throws KeyNotFoundException, @@ -2446,7 +2446,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon { } if (context.isImpersonating()) { - LOG.warn("principal: {} is trying to impersonate principal: {}", context.realPrincipal(), context.principal()); + LOG.info("principal: {} is trying to impersonate principal: {}", context.realPrincipal(), context.principal()); if (impersonationAuthorizer == null) { LOG.warn("impersonation attempt but {} has no authorizer configured. potential security risk, " + "please see SECURITY.MD to learn how to configure impersonation authorizer.", @@ -3109,7 +3109,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon { if (creds != null) { state.setCredentials(topoId, new Credentials(creds), topoConf); } - LOG.info("uploadedJar {}", uploadedJarLocation); + LOG.info("uploadedJar {} for {}", uploadedJarLocation, topoName); setupStormCode(conf, topoId, uploadedJarLocation, totalConfToSave, topology); waitForDesiredCodeReplication(totalConf, topoId); state.setupHeatbeats(topoId, topoConf); http://git-wip-us.apache.org/repos/asf/storm/blob/abca1540/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java ---------------------------------------------------------------------- diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java index d6e5744..4a1b8f8 100644 --- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java +++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Supervisor.java @@ -374,7 +374,7 @@ public class Supervisor implements DaemonCommon, AutoCloseable { } if (context.isImpersonating()) { - LOG.warn("principal: {} is trying to impersonate principal: {}", context.realPrincipal(), + LOG.info("principal: {} is trying to impersonate principal: {}", context.realPrincipal(), context.principal()); throw new WrappedAuthorizationException("Supervisor does not support impersonation"); } http://git-wip-us.apache.org/repos/asf/storm/blob/abca1540/storm-server/src/main/java/org/apache/storm/security/auth/workertoken/WorkerTokenManager.java ---------------------------------------------------------------------- diff --git a/storm-server/src/main/java/org/apache/storm/security/auth/workertoken/WorkerTokenManager.java b/storm-server/src/main/java/org/apache/storm/security/auth/workertoken/WorkerTokenManager.java index 63b995c..a87d448 100644 --- a/storm-server/src/main/java/org/apache/storm/security/auth/workertoken/WorkerTokenManager.java +++ b/storm-server/src/main/java/org/apache/storm/security/auth/workertoken/WorkerTokenManager.java @@ -116,7 +116,7 @@ public class WorkerTokenManager { WorkerToken ret = new WorkerToken(serviceType, ByteBuffer.wrap(serializedInfo), ByteBuffer.wrap(signature)); PrivateWorkerKey key = new PrivateWorkerKey(ByteBuffer.wrap(topoSecret.getEncoded()), user, expirationTimeMillis); state.addPrivateWorkerKey(serviceType, topologyId, nextVersion, key); - LOG.info("Created new WorkerToken for user {} on service {}", user, serviceType); + LOG.info("Created new WorkerToken for user {} topology {} on service {}", user, topologyId, serviceType); return ret; }
