Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HBASE-22013 SpaceQuotas - getNumRegions() returning wrong number of regions due to region replicas" 

This reverts commit 7af5b30eca.
This commit is contained in:
Sakthi 2019-08-21 23:54:25 -07:00
parent 84ee378df1
commit b329bf0a57
3 changed files with 6 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaObserverChore.java
View File

@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.Stoppable;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.RegionReplicaUtil;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.MetricsMaster;
@ -765,9 +764,6 @@ public class QuotaObserverChore extends ScheduledChore {
List<RegionInfo> regions = this.conn.getAdmin().getRegions(table);
if (regions == null) {
return 0;
} else {
// Filter the region replicas if any and return the original number of regions for a table.
RegionReplicaUtil.removeNonDefaultRegions(regions);
}
return regions.size();
}

17
hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/SpaceQuotaHelperForTests.java
View File

@ -306,16 +306,15 @@ public class SpaceQuotaHelperForTests {
}
TableName createTableWithRegions(Admin admin, int numRegions) throws Exception {
return createTableWithRegions(admin, NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, numRegions,
0);
return createTableWithRegions(
testUtil.getAdmin(), NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, numRegions);
}
TableName createTableWithRegions(String namespace, int numRegions) throws Exception {
return createTableWithRegions(testUtil.getAdmin(), namespace, numRegions, 0);
return createTableWithRegions(testUtil.getAdmin(), namespace, numRegions);
}
TableName createTableWithRegions(Admin admin, String namespace, int numRegions,
int numberOfReplicas) throws Exception {
TableName createTableWithRegions(Admin admin, String namespace, int numRegions) throws Exception {
final TableName tn = getNextTableName(namespace);
// Delete the old table
@ -325,14 +324,8 @@ public class SpaceQuotaHelperForTests {
}
// Create the table
TableDescriptor tableDesc;
if (numberOfReplicas > 0) {
tableDesc = TableDescriptorBuilder.newBuilder(tn).setRegionReplication(numberOfReplicas)
TableDescriptor tableDesc = TableDescriptorBuilder.newBuilder(tn)
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(F1)).build();
} else {
tableDesc = TableDescriptorBuilder.newBuilder(tn)
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(F1)).build();
}
if (numRegions == 1) {
admin.createTable(tableDesc);
} else {

47
hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotas.java
View File

@ -38,7 +38,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotEnabledException;
import org.apache.hadoop.hbase.client.Admin;
@ -486,52 +485,6 @@ public class TestSpaceQuotas {
setQuotaLimit(NON_EXISTENT_TABLE, SpaceViolationPolicy.DISABLE, 2L);
}
@Test
public void testSetQuotaWithRegionReplicaSingleRegion() throws Exception {
setQuotaAndVerfiyForRegionReplication(1, 2, SpaceViolationPolicy.NO_INSERTS);
setQuotaAndVerfiyForRegionReplication(1, 2, SpaceViolationPolicy.NO_WRITES);
setQuotaAndVerfiyForRegionReplication(1, 2, SpaceViolationPolicy.NO_WRITES_COMPACTIONS);
setQuotaAndVerfiyForRegionReplication(1, 2, SpaceViolationPolicy.DISABLE);
}
@Test
public void testSetQuotaWithRegionReplicaMultipleRegion() throws Exception {
setQuotaAndVerfiyForRegionReplication(5, 3, SpaceViolationPolicy.NO_INSERTS);
setQuotaAndVerfiyForRegionReplication(6, 3, SpaceViolationPolicy.NO_WRITES);
setQuotaAndVerfiyForRegionReplication(6, 3, SpaceViolationPolicy.NO_WRITES_COMPACTIONS);
setQuotaAndVerfiyForRegionReplication(6, 3, SpaceViolationPolicy.DISABLE);
}
@Test
public void testSetQuotaWithSingleRegionZeroRegionReplica() throws Exception {
setQuotaAndVerfiyForRegionReplication(1, 0, SpaceViolationPolicy.NO_INSERTS);
setQuotaAndVerfiyForRegionReplication(1, 0, SpaceViolationPolicy.NO_WRITES);
setQuotaAndVerfiyForRegionReplication(1, 0, SpaceViolationPolicy.NO_WRITES_COMPACTIONS);
setQuotaAndVerfiyForRegionReplication(1, 0, SpaceViolationPolicy.DISABLE);
}
@Test
public void testSetQuotaWithMultipleRegionZeroRegionReplicas() throws Exception {
setQuotaAndVerfiyForRegionReplication(5, 0, SpaceViolationPolicy.NO_INSERTS);
setQuotaAndVerfiyForRegionReplication(6, 0, SpaceViolationPolicy.NO_WRITES);
setQuotaAndVerfiyForRegionReplication(6, 0, SpaceViolationPolicy.NO_WRITES_COMPACTIONS);
setQuotaAndVerfiyForRegionReplication(6, 0, SpaceViolationPolicy.DISABLE);
}
private void setQuotaAndVerfiyForRegionReplication(int region, int replicatedRegion,
SpaceViolationPolicy policy) throws Exception {
TableName tn = helper.createTableWithRegions(TEST_UTIL.getAdmin(),
NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, region, replicatedRegion);
setQuotaLimit(tn, policy, 5L);
helper.writeData(tn, 5L * SpaceQuotaHelperForTests.ONE_MEGABYTE);
Put p = new Put(Bytes.toBytes("to_reject"));
p.addColumn(Bytes.toBytes(SpaceQuotaHelperForTests.F1), Bytes.toBytes("to"),
Bytes.toBytes("reject"));
// Adding a sleep for 5 sec, so all the chores run and to void flakiness of the test.
Thread.sleep(5000);
verifyViolation(policy, tn, p);
}
public void setQuotaAndViolateNextSwitchPoliciesAndValidate(SpaceViolationPolicy policy1,
SpaceViolationPolicy policy2) throws Exception {
Put put = new Put(Bytes.toBytes("to_reject"));