[helix] branch master updated: Turn on the computation of rebalance type discard throttling turned or not (#1817)

[jxue]

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

jxue 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 9f5ccf9  Turn on the computation of rebalance type discard throttling 
turned or not (#1817)
9f5ccf9 is described below

commit 9f5ccf90feb4f7968d2087b448ae5ba251a4d032
Author: Junkai Xue <j...@linkedin.com>
AuthorDate: Wed Jul 14 15:59:08 2021 -0700

    Turn on the computation of rebalance type discard throttling turned or not 
(#1817)
---
 .../apache/helix/controller/stages/IntermediateStateCalcStage.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java
 
b/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java
index 36bc9cb..1d2ed02 100644
--- 
a/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java
+++ 
b/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java
@@ -300,8 +300,9 @@ public class IntermediateStateCalcStage extends 
AbstractBaseStage {
     LogUtil.logDebug(logger, _eventId, String.format("Processing resource: 
%s", resourceName));
 
     // Throttling is applied only on FULL-AUTO mode and if the resource 
message map is empty, no throttling needed.
-    if (!throttleController.isThrottleEnabled() || 
!IdealState.RebalanceMode.FULL_AUTO.equals(
-        idealState.getRebalanceMode()) || resourceMessageMap.isEmpty()) {
+    // TODO: The potential optimization to make the logic computation async 
and report the metric for recovery/load
+    // rebalance.
+    if 
(!IdealState.RebalanceMode.FULL_AUTO.equals(idealState.getRebalanceMode()) || 
resourceMessageMap.isEmpty()) {
       return bestPossiblePartitionStateMap;
     }