(pinot) 01/01: Fix NPE caused by MultiStageQueryThrottler (#14805)

[jlli]

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

jlli pushed a commit to branch hotfix-npe
in repository https://gitbox.apache.org/repos/asf/pinot.git

commit 43254690fc1ed8f699196e23ca579f87b010ac15
Author: Jialiang Li <j...@linkedin.com>
AuthorDate: Mon Jan 13 18:00:29 2025 -0800

    Fix NPE caused by MultiStageQueryThrottler (#14805)
---
 .../org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
 
b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
index 2aab062730..fa40afb2db 100644
--- 
a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
+++ 
b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
@@ -406,7 +406,9 @@ public abstract class BaseBrokerStarter implements 
ServiceStartable {
       clusterConfigChangeHandler.init(_spectatorHelixManager);
     }
     _clusterConfigChangeHandlers.add(_queryQuotaManager);
-    _clusterConfigChangeHandlers.add(_multiStageQueryThrottler);
+    if (_multiStageQueryThrottler != null) {
+      _clusterConfigChangeHandlers.add(_multiStageQueryThrottler);
+    }
     for (ClusterChangeHandler idealStateChangeHandler : 
_idealStateChangeHandlers) {
       idealStateChangeHandler.init(_spectatorHelixManager);
     }
@@ -416,7 +418,9 @@ public abstract class BaseBrokerStarter implements 
ServiceStartable {
     }
     _externalViewChangeHandlers.add(_routingManager);
     _externalViewChangeHandlers.add(_queryQuotaManager);
-    _externalViewChangeHandlers.add(_multiStageQueryThrottler);
+    if (_multiStageQueryThrottler != null) {
+      _externalViewChangeHandlers.add(_multiStageQueryThrottler);
+    }
     for (ClusterChangeHandler instanceConfigChangeHandler : 
_instanceConfigChangeHandlers) {
       instanceConfigChangeHandler.init(_spectatorHelixManager);
     }


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