Skip to content

HBASE-28756 RegionSizeCalculator ignored the size of memstore, which … #6120

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
ddupg merged 1 commit into from
Jul 26, 2024
+20 −15
Merged

HBASE-28756 RegionSizeCalculator ignored the size of memstore, which … #6120

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
4 changes: 2 additions & 2 deletions hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/RegionSizeCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ private void init(RegionLocator regionLocator, Admin admin) throws IOException {
regionLocator.getName())) {

byte[] regionId = regionLoad.getRegionName();
long regionSizeBytes =
((long) regionLoad.getStoreFileSize().get(Size.Unit.MEGABYTE)) * MEGABYTE;
long regionSizeBytes = ((long) (regionLoad.getStoreFileSize().get(Size.Unit.MEGABYTE)
+ regionLoad.getMemStoreSize().get(Size.Unit.MEGABYTE))) * MEGABYTE;

sizeMap.put(regionId, regionSizeBytes);

Expand Down
31 changes: 18 additions & 13 deletions ...e-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRegionSizeCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,22 @@ public void testSimpleTestCase() throws Exception {

RegionLocator regionLocator = mockRegionLocator("region1", "region2", "region3");

Admin admin = mockAdmin(mockRegion("region1", 123), mockRegion("region3", 1232),
mockRegion("region2", 54321));
Admin admin = mockAdmin(mockRegion("region1", 123, 321), mockRegion("region3", 1232, 2321),
mockRegion("region2", 54321, 12345), mockRegion("region4", 6789, 0),
mockRegion("region5", 0, 4567));

RegionSizeCalculator calculator = new RegionSizeCalculator(regionLocator, admin);

assertEquals(123 * megabyte, calculator.getRegionSize(Bytes.toBytes("region1")));
assertEquals(54321 * megabyte, calculator.getRegionSize(Bytes.toBytes("region2")));
assertEquals(1232 * megabyte, calculator.getRegionSize(Bytes.toBytes("region3")));
assertEquals((123 + 321) * megabyte, calculator.getRegionSize(Bytes.toBytes("region1")));
assertEquals((54321 + 12345) * megabyte, calculator.getRegionSize(Bytes.toBytes("region2")));
assertEquals((1232 + 2321) * megabyte, calculator.getRegionSize(Bytes.toBytes("region3")));
assertEquals(6789 * megabyte, calculator.getRegionSize(Bytes.toBytes("region4")));
assertEquals(4567 * megabyte, calculator.getRegionSize(Bytes.toBytes("region5")));

// if regionCalculator does not know about a region, it should return 0
assertEquals(0, calculator.getRegionSize(Bytes.toBytes("otherTableRegion")));

assertEquals(3, calculator.getRegionSizeMap().size());
assertEquals(5, calculator.getRegionSizeMap().size());
}

/**
Expand All @@ -85,11 +88,11 @@ public void testLargeRegion() throws Exception {

RegionLocator regionLocator = mockRegionLocator("largeRegion");

Admin admin = mockAdmin(mockRegion("largeRegion", Integer.MAX_VALUE));
Admin admin = mockAdmin(mockRegion("largeRegion", Integer.MAX_VALUE, Integer.MAX_VALUE));

RegionSizeCalculator calculator = new RegionSizeCalculator(regionLocator, admin);

assertEquals(((long) Integer.MAX_VALUE) * megabyte,
assertEquals(((long) Integer.MAX_VALUE) * 2L * megabyte,
calculator.getRegionSize(Bytes.toBytes("largeRegion")));
}

Expand All @@ -99,11 +102,11 @@ public void testDisabled() throws Exception {
String regionName = "cz.goout:/index.html";
RegionLocator table = mockRegionLocator(regionName);

Admin admin = mockAdmin(mockRegion(regionName, 999));
Admin admin = mockAdmin(mockRegion(regionName, 999, 888));

// first request on enabled calculator
RegionSizeCalculator calculator = new RegionSizeCalculator(table, admin);
assertEquals(999 * megabyte, calculator.getRegionSize(Bytes.toBytes(regionName)));
assertEquals((999 + 888) * megabyte, calculator.getRegionSize(Bytes.toBytes(regionName)));

// then disabled calculator.
configuration.setBoolean(RegionSizeCalculator.ENABLE_REGIONSIZECALCULATOR, false);
Expand All @@ -116,7 +119,7 @@ public void testDisabled() throws Exception {
public void testRegionWithNullServerName() throws Exception {
RegionLocator regionLocator =
mockRegionLocator(null, Collections.singletonList("someBigRegion"));
Admin admin = mockAdmin(mockRegion("someBigRegion", Integer.MAX_VALUE));
Admin admin = mockAdmin(mockRegion("someBigRegion", Integer.MAX_VALUE, Integer.MAX_VALUE));
RegionSizeCalculator calculator = new RegionSizeCalculator(regionLocator, admin);
assertEquals(0, calculator.getRegionSize(Bytes.toBytes("someBigRegion")));
}
Expand Down Expand Up @@ -158,13 +161,15 @@ private Admin mockAdmin(RegionMetrics... regionLoadArray) throws Exception {

/**
* Creates mock of region with given name and size.
* @param fileSizeMb number of megabytes occupied by region in file store in megabytes
* @param fileSizeMb number of megabytes occupied by region in file store in megabytes
* @param memStoreSize number of megabytes occupied by region in memstore in megabytes
*/
private RegionMetrics mockRegion(String regionName, int fileSizeMb) {
private RegionMetrics mockRegion(String regionName, int fileSizeMb, int memStoreSize) {
RegionMetrics region = Mockito.mock(RegionMetrics.class);
when(region.getRegionName()).thenReturn(Bytes.toBytes(regionName));
when(region.getNameAsString()).thenReturn(regionName);
when(region.getStoreFileSize()).thenReturn(new Size(fileSizeMb, Size.Unit.MEGABYTE));
when(region.getMemStoreSize()).thenReturn(new Size(memStoreSize, Size.Unit.MEGABYTE));
return region;
}
}