[hbase] branch branch-2 updated: HBASE-22562 Remove dead code: skipControl

[el...@apache.org]

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

elserj pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 08287f5  HBASE-22562 Remove dead code: skipControl
08287f5 is described below

commit 08287f570640e7e9beffea190cd916bad4c29b06
Author: Josh Elser <el...@apache.org>
AuthorDate: Wed Jun 12 19:15:14 2019 -0400

    HBASE-22562 Remove dead code: skipControl
    
    Signed-off-by: Reid Chan <re...@apache.org>
---
 .../throttle/PressureAwareCompactionThroughputController.java    | 9 ---------
 .../throttle/PressureAwareFlushThroughputController.java         | 6 ------
 .../regionserver/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 740152d..5052f30 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
@@ -146,13 +146,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 fac4e86..51e7b42 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 27c25ea..306df0b 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);