[helix] branch master updated: Fix controller pipeline log info (#1588)

[hzlu]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e36078f  Fix controller pipeline log info (#1588)
e36078f is described below

commit e36078f3b655bf98562d1180202033edd51e3dd0
Author: Huizhi Lu <ihuizhi...@gmail.com>
AuthorDate: Mon Dec 14 22:24:32 2020 -0800

    Fix controller pipeline log info (#1588)
    
    The log for invoking pipeline in controller is incorrect: cluster name and 
pipeline name is mis-ordered. This commit corrects the order.
---
 .../java/org/apache/helix/controller/GenericHelixController.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
 
b/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
index 9399014..3673a07 100644
--- 
a/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
+++ 
b/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
@@ -729,7 +729,8 @@ public class GenericHelixController implements 
IdealStateChangeListener, LiveIns
             "Controller pipeline is not invoked because event session doesn't 
match cluster " +
                 "manager session. Event type: {}, id: {}, session: {}, actual 
manager session: "
                 + "{}, instance: {}, cluster: {}", event.getEventType(), 
event.getEventId(),
-            eventSessionId.orElse("NOT_PRESENT"), managerSessionId, 
manager.getInstanceName(), manager.getClusterName());
+            eventSessionId.orElse("NOT_PRESENT"), managerSessionId, 
manager.getInstanceName(),
+            manager.getClusterName());
         return;
       }
     }
@@ -791,7 +792,7 @@ public class GenericHelixController implements 
IdealStateChangeListener, LiveIns
     event.addAttribute(AttributeName.ControllerDataProvider.name(), 
dataProvider);
 
     logger.info("START: Invoking {} controller pipeline for cluster: {}. Event 
type: {}, ID: {}. "
-            + "Event session ID: {}", manager.getClusterName(), 
dataProvider.getPipelineName(),
+            + "Event session ID: {}", dataProvider.getPipelineName(), 
manager.getClusterName(),
         event.getEventType(), event.getEventId(), 
eventSessionId.orElse("NOT_PRESENT"));
 
     long startTime = System.currentTimeMillis();