shardul-cr7 commented on a change in pull request #572: HBASE-22012 Space
Quota: DisableTableViolationPolicy will cause cycles of enable/disable table
URL: https://github.com/apache/hbase/pull/572#discussion_r326918354
##########
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java
##########
@@ -694,23 +695,65 @@ public void addRegionSize(RegionInfo hri, long size,
long time) {
return copy;
}
- int pruneEntriesOlderThan(long timeToPruneBefore) {
+ int pruneEntriesOlderThan(long timeToPruneBefore, QuotaObserverChore
quotaObserverChore) {
if (regionSizes == null) {
return 0;
}
int numEntriesRemoved = 0;
- Iterator<Entry<RegionInfo,SizeSnapshotWithTimestamp>> iterator =
+ Iterator<Entry<RegionInfo, SizeSnapshotWithTimestamp>> iterator =
regionSizes.entrySet().iterator();
while (iterator.hasNext()) {
- long currentEntryTime = iterator.next().getValue().getTime();
- if (currentEntryTime < timeToPruneBefore) {
+ RegionInfo regionInfo = iterator.next().getKey();
+ long currentEntryTime = regionSizes.get(regionInfo).getTime();
+ // do not prune the entries if table is in violation and
+ // violation policy is disable to avoid cycle of enable/disable.
+ // Please refer HBASE-22012 for more details.
+ // prune entries older than time.
+ if (currentEntryTime < timeToPruneBefore &&
!isInViolationAndPolicyDisable(
+ regionInfo.getTable(), quotaObserverChore)) {
iterator.remove();
numEntriesRemoved++;
}
}
return numEntriesRemoved;
}
+ /**
+ * Method to check if a table is in violation and policy set on table is
DISABLE.
+ *
+ * @param tableName tableName to check.
+ * @param quotaObserverChore QuotaObserverChore instance
+ * @return returns true if table is in violation and policy is disable else
false.
+ */
+ private boolean isInViolationAndPolicyDisable(TableName tableName,
+ QuotaObserverChore quotaObserverChore) {
+ boolean isInViolationAtTable = false;
+ boolean isInViolationAtNamespace = false;
+ SpaceViolationPolicy policy = null;
+ // Get Current Snapshot for the given table
+ SpaceQuotaSnapshot tableQuotaSnapshot =
quotaObserverChore.getTableQuotaSnapshot(tableName);
+ SpaceQuotaSnapshot namespaceQuotaSnapshot =
+
quotaObserverChore.getNamespaceQuotaSnapshot(tableName.getNamespaceAsString());
+ if (tableQuotaSnapshot != null) {
Review comment:
Good catch. @joshelser . Did all the changes and pushed.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
