Skip to content

HBASE-28183 It's impossible to re-enable the quota table if it gets d… #5691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2024
Merged

HBASE-28183 It's impossible to re-enable the quota table if it gets d… #5691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2728,16 +2728,20 @@ protected void run() throws IOException {
MasterQuotaManager quotaManager = getMasterQuotaManager();
if (quotaManager != null) {
if (quotaManager.isQuotaInitialized()) {
SpaceQuotaSnapshot currSnapshotOfTable =
QuotaTableUtil.getCurrentSnapshotFromQuotaTable(getConnection(), tableName);
if (currSnapshotOfTable != null) {
SpaceQuotaStatus quotaStatus = currSnapshotOfTable.getQuotaStatus();
if (
quotaStatus.isInViolation()
&& SpaceViolationPolicy.DISABLE == quotaStatus.getPolicy().orElse(null)
) {
throw new AccessDeniedException("Enabling the table '" + tableName
+ "' is disallowed due to a violated space quota.");
// skip checking quotas for system tables, see:
// https://issues.apache.org/jira/browse/HBASE-28183
if (!tableName.isSystemTable()) {
SpaceQuotaSnapshot currSnapshotOfTable =
QuotaTableUtil.getCurrentSnapshotFromQuotaTable(getConnection(), tableName);
if (currSnapshotOfTable != null) {
SpaceQuotaStatus quotaStatus = currSnapshotOfTable.getQuotaStatus();
if (
quotaStatus.isInViolation()
&& SpaceViolationPolicy.DISABLE == quotaStatus.getPolicy().orElse(null)
) {
throw new AccessDeniedException("Enabling the table '" + tableName
+ "' is disallowed due to a violated space quota.");
}
}
}
} else if (LOG.isTraceEnabled()) {
Expand Down
11 changes: 11 additions & 0 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,4 +994,15 @@ public int getQuotaSettingCount(Admin admin) throws IOException {
}
return quotaSettingCount;
}

@Test
public void testQuotaTableDisableAndEnable() throws Exception {
final Admin admin = TEST_UTIL.getAdmin();
admin.disableTable(QuotaUtil.QUOTA_TABLE_NAME);
try {
admin.enableTable(QuotaUtil.QUOTA_TABLE_NAME);
} catch (Exception ex) {
fail("Got an exception while enabling table: " + QuotaUtil.QUOTA_TABLE_NAME);
}
}
}