You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by me...@apache.org on 2021/04/09 02:24:10 UTC
[hbase] branch master updated: HBASE-25747 Remove unused
getWriteAvailable method in OperationQuota (#3133)
This is an automated email from the ASF dual-hosted git repository.
meiyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new ad06aa2 HBASE-25747 Remove unused getWriteAvailable method in OperationQuota (#3133)
ad06aa2 is described below
commit ad06aa2082dfc8e9b9b1c4e95f70db090483ee3a
Author: meiyi <my...@gmail.com>
AuthorDate: Fri Apr 9 10:23:34 2021 +0800
HBASE-25747 Remove unused getWriteAvailable method in OperationQuota (#3133)
Signed-off-by: stack <st...@apache.org>
---
.../org/apache/hadoop/hbase/quotas/DefaultOperationQuota.java | 11 -----------
.../org/apache/hadoop/hbase/quotas/ExceedOperationQuota.java | 1 -
.../org/apache/hadoop/hbase/quotas/NoopOperationQuota.java | 5 -----
.../java/org/apache/hadoop/hbase/quotas/OperationQuota.java | 3 ---
4 files changed, 20 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.java
index 6f0e5cd..d4c2264 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.java
@@ -24,22 +24,18 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.client.Result;
@InterfaceAudience.Private
@InterfaceStability.Evolving
public class DefaultOperationQuota implements OperationQuota {
- private static final Logger LOG = LoggerFactory.getLogger(DefaultOperationQuota.class);
protected final List<QuotaLimiter> limiters;
private final long writeCapacityUnit;
private final long readCapacityUnit;
// the available read/write quota size in bytes
- protected long writeAvailable = 0;
protected long readAvailable = 0;
// estimated quota
protected long writeConsumed = 0;
@@ -81,7 +77,6 @@ public class DefaultOperationQuota implements OperationQuota {
public void checkQuota(int numWrites, int numReads, int numScans) throws RpcThrottlingException {
updateEstimateConsumeQuota(numWrites, numReads, numScans);
- writeAvailable = Long.MAX_VALUE;
readAvailable = Long.MAX_VALUE;
for (final QuotaLimiter limiter : limiters) {
if (limiter.isBypass()) continue;
@@ -89,7 +84,6 @@ public class DefaultOperationQuota implements OperationQuota {
limiter.checkQuota(numWrites, writeConsumed, numReads + numScans, readConsumed,
writeCapacityUnitConsumed, readCapacityUnitConsumed);
readAvailable = Math.min(readAvailable, limiter.getReadAvailable());
- writeAvailable = Math.min(writeAvailable, limiter.getWriteAvailable());
}
for (final QuotaLimiter limiter : limiters) {
@@ -126,11 +120,6 @@ public class DefaultOperationQuota implements OperationQuota {
}
@Override
- public long getWriteAvailable() {
- return writeAvailable;
- }
-
- @Override
public void addGetResult(final Result result) {
operationSize[OperationType.GET.ordinal()] += QuotaUtil.calculateResultSize(result);
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/ExceedOperationQuota.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/ExceedOperationQuota.java
index 5c9541e..6745d3e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/ExceedOperationQuota.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/ExceedOperationQuota.java
@@ -75,7 +75,6 @@ public class ExceedOperationQuota extends DefaultOperationQuota {
}
// 4. Region server limiter is enough and grab estimated consume quota.
readAvailable = Math.max(readAvailable, regionServerLimiter.getReadAvailable());
- writeAvailable = Math.max(writeAvailable, regionServerLimiter.getWriteAvailable());
regionServerLimiter.grabQuota(numWrites, writeConsumed, numReads + numScans, readConsumed,
writeCapacityUnitConsumed, writeCapacityUnitConsumed);
if (exceed) {
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/NoopOperationQuota.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/NoopOperationQuota.java
index ca2aa35..81ac312 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/NoopOperationQuota.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/NoopOperationQuota.java
@@ -71,9 +71,4 @@ class NoopOperationQuota implements OperationQuota {
public long getReadAvailable() {
return Long.MAX_VALUE;
}
-
- @Override
- public long getWriteAvailable() {
- return Long.MAX_VALUE;
- }
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/OperationQuota.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/OperationQuota.java
index 1863b4c..e10a671 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/OperationQuota.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/OperationQuota.java
@@ -70,7 +70,4 @@ public interface OperationQuota {
/** @return the number of bytes available to read to avoid exceeding the quota */
long getReadAvailable();
-
- /** @return the number of bytes available to write to avoid exceeding the quota */
- long getWriteAvailable();
}