[bookkeeper] branch master updated: [TABLE SERVICE] [LOGGING] improve logging at zk storage container manager

[sijie]

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new fa2f19d  [TABLE SERVICE] [LOGGING] improve logging at zk storage 
container manager
fa2f19d is described below

commit fa2f19d076cde5514a5f24613045b14a491871d4
Author: Sijie Guo <guosi...@gmail.com>
AuthorDate: Wed Sep 26 02:43:57 2018 -0700

    [TABLE SERVICE] [LOGGING] improve logging at zk storage container manager
    
    Descriptions of the changes in this PR:
    
    *Motivation*
    
    the storage container manager probes containers to ensure containers are 
started and stopped to reflect to topology change.
    however the logging can be very annoying if there is no topology changed.
    
    *Changes*
    
    Improve the logic to only log the message when topology is changed.
    
    
    
    
    Author: Sijie Guo <guosi...@gmail.com>
    Author: Qi Wang <42832902+codingwan...@users.noreply.github.com>
    Author: Sijie Guo <si...@apache.org>
    Author: Charan Reddy Guttapalem <reddychara...@gmail.com>
    
    Reviewers: Enrico Olivelli <eolive...@gmail.com>, Jia Zhai <None>
    
    This closes #1704 from sijie/reducing_logging_storage_containers
---
 .../storage/impl/sc/ZkStorageContainerManager.java   | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git 
a/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/sc/ZkStorageContainerManager.java
 
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/sc/ZkStorageContainerManager.java
index b6350fe..f4fdc4d 100644
--- 
a/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/sc/ZkStorageContainerManager.java
+++ 
b/stream/storage/impl/src/main/java/org/apache/bookkeeper/stream/storage/impl/sc/ZkStorageContainerManager.java
@@ -184,7 +184,9 @@ public class ZkStorageContainerManager
 
     private void processServersJoined(Set<Endpoint> serversJoined,
                                       Map<Endpoint, ServerAssignmentData> 
newAssignmentMap) {
-        log.info("Servers joined : {}", serversJoined);
+        if (!serversJoined.isEmpty()) {
+            log.info("Servers joined : {}", serversJoined);
+        }
         serversJoined.forEach(ep -> {
             ServerAssignmentData sad = newAssignmentMap.get(ep);
             if (null != sad) {
@@ -195,7 +197,9 @@ public class ZkStorageContainerManager
 
     private void processServersLeft(Set<Endpoint> serversLeft,
                                     Map<Endpoint, ServerAssignmentData> 
oldAssignmentMap) {
-        log.info("Servers left : {}", serversLeft);
+        if (!serversLeft.isEmpty()) {
+            log.info("Servers left : {}", serversLeft);
+        }
         serversLeft.forEach(ep -> {
             ServerAssignmentData sad = oldAssignmentMap.get(ep);
             if (null != sad) {
@@ -246,9 +250,15 @@ public class ZkStorageContainerManager
         containersToStop =
             Sets.filter(containersToStop, container -> 
!pendingStartStopContainers.contains(container));
 
-        log.info("Process container changes:\n\tIdeal = {}\n\tLive = {}\n\t"
-            + "Pending = {}\n\tToStart = {}\n\tToStop = {}",
-            assignedContainerSet, liveContainerSet, 
pendingStartStopContainers, containersToStart, containersToStop);
+        if (!containersToStart.isEmpty() || !containersToStop.isEmpty()) {
+            log.info("Process container changes:\n\tIdeal = {}\n\tLive = 
{}\n\t"
+                    + "Pending = {}\n\tToStart = {}\n\tToStop = {}",
+                assignedContainerSet,
+                liveContainerSet,
+                pendingStartStopContainers,
+                containersToStart,
+                containersToStop);
+        }
 
         containersToStart.forEach(this::startStorageContainer);
         containersToStop.forEach(this::stopStorageContainer);