[server] fix npe in adaptive throttler code (#1456)

Co-authored-by: Sourav Maji <[email protected]>
linkedin · Jan 17, 2025 · cf814c7 · cf814c7
1 parent 216474f
commit cf814c7
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/...da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/IngestionThrottler.java b/...da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/IngestionThrottler.java
@@ -187,12 +187,8 @@ public IngestionThrottler(
           this.isUsingSpeedupThrottler = true;
         } else if (!hasCurrentVersionBootstrapping && isUsingSpeedupThrottler) {
           LOGGER.info("There is no active current version bootstrapping, so switch to regular throttler");
-          this.finalRecordThrottler = serverConfig.isAdaptiveThrottlerEnabled()
-              ? globalRecordAdaptiveIngestionThrottler
-              : globalRecordThrottler;
-          this.finalBandwidthThrottler = serverConfig.isAdaptiveThrottlerEnabled()
-              ? globalBandwidthAdaptiveIngestionThrottler
-              : globalBandwidthThrottler;
+          this.finalRecordThrottler = globalRecordThrottler;
+          this.finalBandwidthThrottler = globalBandwidthThrottler;
           this.isUsingSpeedupThrottler = false;
         }
 
@@ -204,8 +200,11 @@ public IngestionThrottler(
       this.eventThrottlerUpdateService = null;
     }
 
-    this.finalRecordThrottler = globalRecordThrottler;
-    this.finalBandwidthThrottler = globalBandwidthThrottler;
+    this.finalRecordThrottler =
+        serverConfig.isAdaptiveThrottlerEnabled() ? globalRecordAdaptiveIngestionThrottler : globalRecordThrottler;
+    this.finalBandwidthThrottler = serverConfig.isAdaptiveThrottlerEnabled()
+        ? globalBandwidthAdaptiveIngestionThrottler
+        : globalBandwidthThrottler;
   }
 
   public void maybeThrottleRecordRate(ConsumerPoolType poolType, int count) {