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

kharekartik pushed a commit to branch controller_api_patch
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git

commit 36babc3ef54be37809e8b0e14119080a3aada5ca
Author: Kartik Khare <kharekartik@Kartiks-MacBook-Pro.local>
AuthorDate: Wed Sep 16 01:10:38 2020 +0530

    change in constructors of listeners
---
 .../controller/helix/core/PinotHelixResourceManager.java    | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git 
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
 
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
index 917a777..27920db 100644
--- 
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
+++ 
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
@@ -104,7 +104,6 @@ import 
org.apache.pinot.controller.helix.core.assignment.instance.InstanceAssign
 import 
org.apache.pinot.controller.helix.core.assignment.segment.SegmentAssignment;
 import 
org.apache.pinot.controller.helix.core.assignment.segment.SegmentAssignmentFactory;
 import 
org.apache.pinot.controller.helix.core.assignment.segment.SegmentAssignmentUtils;
-import 
org.apache.pinot.controller.helix.core.listener.ClusterExternalViewChangeListener;
 import 
org.apache.pinot.controller.helix.core.listener.ClusterInstanceConfigChangeListener;
 import 
org.apache.pinot.controller.helix.core.listener.ClusterLiveInstanceChangeListener;
 import 
org.apache.pinot.controller.helix.core.realtime.PinotLLCRealtimeSegmentManager;
@@ -166,7 +165,6 @@ public class PinotHelixResourceManager {
   private TableCache _tableCache;
   private ClusterInstanceConfigChangeListener 
_clusterInstanceConfigChangeListener;
   private ClusterLiveInstanceChangeListener _clusterLiveInstanceChangeListener;
-  private ClusterExternalViewChangeListener _clusterExternalViewChangeListener;
 
   public PinotHelixResourceManager(String zkURL, String helixClusterName, 
@Nullable String dataDir,
       long externalViewOnlineToOfflineTimeoutMillis, boolean 
isSingleTenantCluster, boolean enableBatchMessageMode,
@@ -231,13 +229,11 @@ public class PinotHelixResourceManager {
         
.parseBoolean(configs.get(Helix.DEPRECATED_ENABLE_CASE_INSENSITIVE_KEY));
     _tableCache = new TableCache(_propertyStore, caseInsensitive);
 
-    _clusterInstanceConfigChangeListener = new 
ClusterInstanceConfigChangeListener();
-    _clusterLiveInstanceChangeListener = new 
ClusterLiveInstanceChangeListener();
-    _clusterExternalViewChangeListener = new 
ClusterExternalViewChangeListener();
+    _clusterInstanceConfigChangeListener = new 
ClusterInstanceConfigChangeListener(_helixZkManager);
+    _clusterLiveInstanceChangeListener = new 
ClusterLiveInstanceChangeListener(_helixDataAccessor, _keyBuilder);
     try {
       addConfigListeners(_clusterInstanceConfigChangeListener);
       addLiveInstanceListeners(_clusterLiveInstanceChangeListener);
-      addExternalViewListeners(_clusterExternalViewChangeListener);
     } catch (Exception e) {
       LOGGER.warn(
           "Unable to add config listener in controller. This will result in 
incorrect response from controller's broker API");
@@ -2215,11 +2211,6 @@ public class PinotHelixResourceManager {
     _helixZkManager.addLiveInstanceChangeListener(liveInstanceChangeListener);
   }
 
-  public void addExternalViewListeners(ExternalViewChangeListener 
externalViewChangeListener)
-      throws Exception {
-    _helixZkManager.addExternalViewChangeListener(externalViewChangeListener);
-  }
-
   /**
    * Provides admin endpoints for the provided data instances
    * @param instances instances for which to read endpoints


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org

Reply via email to