Repository: hadoop Updated Branches: refs/heads/trunk 35ce6eb1f -> cd0b9f138
HDDS-282. Consolidate logging in scm/container-service. Contributed by Elek Marton. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cd0b9f13 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cd0b9f13 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cd0b9f13 Branch: refs/heads/trunk Commit: cd0b9f13805affcc91a2cba42b176bb9031378eb Parents: 35ce6eb Author: Xiaoyu Yao <x...@apache.org> Authored: Tue Jul 24 10:16:53 2018 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Tue Jul 24 10:17:03 2018 -0700 ---------------------------------------------------------------------- .../container/common/statemachine/EndpointStateMachine.java | 4 ++-- .../common/states/endpoint/RegisterEndpointTask.java | 3 +-- .../statemachine/background/BlockDeletingService.java | 8 +++++--- .../org/apache/hadoop/hdds/server/events/EventQueue.java | 3 +-- .../org/apache/hadoop/hdds/server/events/TypedEvent.java | 6 ++++-- 5 files changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cd0b9f13/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java index 7e85923..fb32a05 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java @@ -203,11 +203,11 @@ public class EndpointStateMachine this.incMissed(); if (this.getMissedCount() % getLogWarnInterval(conf) == 0) { - LOG.warn("Unable to communicate to SCM server at {}. We have not been " + + LOG.error("Unable to communicate to SCM server at {}. We have not been " + "able to communicate to this SCM server for past {} seconds.", this.getAddress().getHostString() + ":" + this.getAddress().getPort(), this.getMissedCount() * getScmHeartbeatInterval( - this.conf)); + this.conf), ex); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/cd0b9f13/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java index b3d2b62..25af4a1 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java @@ -125,8 +125,7 @@ public final class RegisterEndpointTask implements rpcEndPoint.setState(nextState); rpcEndPoint.zeroMissedCount(); } catch (IOException ex) { - rpcEndPoint.logIfNeeded(ex - ); + rpcEndPoint.logIfNeeded(ex); } finally { rpcEndPoint.unlock(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/cd0b9f13/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java index 4a572ca..51eed7f 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/statemachine/background/BlockDeletingService.java @@ -119,9 +119,11 @@ public class BlockDeletingService extends BackgroundService{ // configured. containers = containerSet.chooseContainerForBlockDeletion( containerLimitPerInterval, containerDeletionPolicy); - LOG.info("Plan to choose {} containers for block deletion, " - + "actually returns {} valid containers.", - containerLimitPerInterval, containers.size()); + if (containers.size() > 0) { + LOG.info("Plan to choose {} containers for block deletion, " + + "actually returns {} valid containers.", + containerLimitPerInterval, containers.size()); + } for(ContainerData container : containers) { BlockDeletingTask containerTask = http://git-wip-us.apache.org/repos/asf/hadoop/blob/cd0b9f13/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/EventQueue.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/EventQueue.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/EventQueue.java index 7e29223..f93c54b 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/EventQueue.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/EventQueue.java @@ -155,8 +155,7 @@ public class EventQueue implements EventPublisher, AutoCloseable { } } else { - throw new IllegalArgumentException( - "No event handler registered for event " + event); + LOG.warn("No event handler registered for event " + event); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/cd0b9f13/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/TypedEvent.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/TypedEvent.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/TypedEvent.java index 62e2419..27bba3a 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/TypedEvent.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/TypedEvent.java @@ -50,7 +50,9 @@ public class TypedEvent<T> implements Event<T> { @Override public String toString() { - return "TypedEvent{" + "payloadType=" + payloadType + ", name='" + name - + '\'' + '}'; + return "TypedEvent{" + + "payloadType=" + payloadType.getSimpleName() + + ", name='" + name + '\'' + + '}'; } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org