bbeaudreault commented on code in PR #5713:
URL: https://github.com/apache/hbase/pull/5713#discussion_r1518392967
##########
hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.java:
##########
@@ -80,21 +91,45 @@ public DefaultOperationQuota(final Configuration conf,
final List<QuotaLimiter>
}
@Override
- public void checkQuota(int numWrites, int numReads, int numScans) throws
RpcThrottlingException {
- updateEstimateConsumeQuota(numWrites, numReads, numScans);
+ public void checkQuota(int numWrites, int numReads) throws
RpcThrottlingException {
+ updateEstimateConsumeBatchQuota(numWrites, numReads);
readAvailable = Long.MAX_VALUE;
for (final QuotaLimiter limiter : limiters) {
- if (limiter.isBypass()) continue;
+ if (limiter.isBypass()) {
+ continue;
+ }
- limiter.checkQuota(numWrites, writeConsumed, numReads + numScans,
readConsumed,
+ limiter.checkQuota(numWrites, writeConsumed, numReads, readConsumed,
writeCapacityUnitConsumed, readCapacityUnitConsumed);
readAvailable = Math.min(readAvailable, limiter.getReadAvailable());
}
for (final QuotaLimiter limiter : limiters) {
- limiter.grabQuota(numWrites, writeConsumed, numReads + numScans,
readConsumed,
- writeCapacityUnitConsumed, readCapacityUnitConsumed);
+ limiter.grabQuota(numWrites, writeConsumed, numReads, readConsumed,
writeCapacityUnitConsumed,
+ readCapacityUnitConsumed);
+ }
+ }
+
+ @Override
+ public void checkScanQuota(ClientProtos.ScanRequest scanRequest, long
maxScannerResultSize,
+ long maxBlockBytesScanned) throws RpcThrottlingException {
+ updateEstimateConsumeScanQuota(scanRequest, maxScannerResultSize,
maxBlockBytesScanned);
+
+ readAvailable = Long.MAX_VALUE;
Review Comment:
I wonder if we really need to duplicate the below code. Is the difference
really just which estimate we use?
##########
hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.java:
##########
@@ -80,21 +91,45 @@ public DefaultOperationQuota(final Configuration conf,
final List<QuotaLimiter>
}
@Override
- public void checkQuota(int numWrites, int numReads, int numScans) throws
RpcThrottlingException {
- updateEstimateConsumeQuota(numWrites, numReads, numScans);
+ public void checkQuota(int numWrites, int numReads) throws
RpcThrottlingException {
+ updateEstimateConsumeBatchQuota(numWrites, numReads);
readAvailable = Long.MAX_VALUE;
for (final QuotaLimiter limiter : limiters) {
- if (limiter.isBypass()) continue;
+ if (limiter.isBypass()) {
+ continue;
+ }
- limiter.checkQuota(numWrites, writeConsumed, numReads + numScans,
readConsumed,
+ limiter.checkQuota(numWrites, writeConsumed, numReads, readConsumed,
writeCapacityUnitConsumed, readCapacityUnitConsumed);
readAvailable = Math.min(readAvailable, limiter.getReadAvailable());
}
for (final QuotaLimiter limiter : limiters) {
- limiter.grabQuota(numWrites, writeConsumed, numReads + numScans,
readConsumed,
- writeCapacityUnitConsumed, readCapacityUnitConsumed);
+ limiter.grabQuota(numWrites, writeConsumed, numReads, readConsumed,
writeCapacityUnitConsumed,
+ readCapacityUnitConsumed);
+ }
+ }
+
+ @Override
+ public void checkScanQuota(ClientProtos.ScanRequest scanRequest, long
maxScannerResultSize,
+ long maxBlockBytesScanned) throws RpcThrottlingException {
+ updateEstimateConsumeScanQuota(scanRequest, maxScannerResultSize,
maxBlockBytesScanned);
+
+ readAvailable = Long.MAX_VALUE;
Review Comment:
Seeing the ExceedQuota code necessary, I feel like we should try to
reorganize a little so that checkScanQuota can call checkQuota. Thus deleting a
lot of code in both classes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
