From 3d64cf120334634f72559d34e59524db2e36307b Mon Sep 17 00:00:00 2001 From: Josh Elser Date: Wed, 12 Jun 2019 19:15:14 -0400 Subject: [PATCH] HBASE-22562 Remove dead code: skipControl Signed-off-by: Reid Chan --- .../PressureAwareCompactionThroughputController.java | 9 --------- .../throttle/PressureAwareFlushThroughputController.java | 6 ------ .../throttle/PressureAwareThroughputController.java | 8 -------- 3 files changed, 23 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareCompactionThroughputController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareCompactionThroughputController.java index b3c7bf37a24..7e9b208bf6a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareCompactionThroughputController.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareCompactionThroughputController.java @@ -143,13 +143,4 @@ public class PressureAwareCompactionThroughputController extends PressureAwareTh + throughputDesc(getMaxThroughput()) + ", activeCompactions=" + activeOperations.size() + "]"; } - - @Override - protected boolean skipControl(long deltaSize, long controlSize) { - if (deltaSize < controlSize) { - return true; - } else { - return false; - } - } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareFlushThroughputController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareFlushThroughputController.java index fac4e86e5d4..51e7b42bf9d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareFlushThroughputController.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareFlushThroughputController.java @@ -128,10 +128,4 @@ public class PressureAwareFlushThroughputController extends PressureAwareThrough return "DefaultFlushController [maxThroughput=" + throughputDesc(getMaxThroughput()) + ", activeFlushNumber=" + activeOperations.size() + "]"; } - - @Override - protected boolean skipControl(long deltaSize, long controlSize) { - // for flush, we control the flow no matter whether the flush size is small - return false; - } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareThroughputController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareThroughputController.java index 27c25eac67c..306df0b9d5a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareThroughputController.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/throttle/PressureAwareThroughputController.java @@ -137,14 +137,6 @@ public abstract class PressureAwareThroughputController extends Configured imple return sleepTime; } - /** - * Check whether to skip control given delta size and control size - * @param deltaSize Delta size since last control - * @param controlSize Size limit to perform control - * @return a boolean indicates whether to skip this control - */ - protected abstract boolean skipControl(long deltaSize, long controlSize); - @Override public void finish(String opName) { ActiveOperation operation = activeOperations.remove(opName);