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

HBASE-25301 NPE while running balance_rsgroup if any split region is present.

This commit is contained in:
Sanjeet Nishad 2020-12-15 18:15:42 +05:30
parent d50816fe44
commit c625ab4f07
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
View File

@ -1130,6 +1130,12 @@ final class RSGroupInfoManagerImpl implements RSGroupInfoManager {
if (region.isSplitParent()) { if (region.isSplitParent()) {
continue; continue;
} }
// isSplitParent() and isSplit() is not always reliable. So for those scenarios, better to
// have a check here.
if(null == server) {
continue;
}
result.computeIfAbsent(tn, k -> new HashMap<>()) result.computeIfAbsent(tn, k -> new HashMap<>())
.computeIfAbsent(server, k -> new ArrayList<>()).add(region); .computeIfAbsent(server, k -> new ArrayList<>()).add(region);
} }

35
hbase-server/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.java
View File

@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.TableNotFoundException;
import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.Waiter;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor; import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.constraint.ConstraintException; import org.apache.hadoop.hbase.constraint.ConstraintException;
@ -621,4 +622,38 @@ public class TestRSGroupsAdmin1 extends TestRSGroupsBase {
TEST_UTIL.deleteTable(tableName); TEST_UTIL.deleteTable(tableName);
ADMIN.deleteNamespace(ns); ADMIN.deleteNamespace(ns);
} }
@Test
public void testHBASE25301() throws IOException, InterruptedException {
String pgroup = "pgroup";
ADMIN.addRSGroup(pgroup);
ServerName serverName0 = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0).getServerName();
ServerName serverName1 = TEST_UTIL.getMiniHBaseCluster().getRegionServer(1).getServerName();
ADMIN.moveServersToRSGroup(Sets.newHashSet(serverName0.getAddress(), serverName1.getAddress()),
pgroup);
TableName table1 = TableName.valueOf("table1");
TableName table2 = TableName.valueOf("table2");
TEST_UTIL.createTable(table1, "cf");
TEST_UTIL.createTable(table2, "cf");
ADMIN.setRSGroup(Sets.newHashSet(table1, table2), pgroup);
List<RegionInfo> regionInfoList = ADMIN.getRegions(table1);
regionInfoList.addAll(ADMIN.getRegions(table2));
for (RegionInfo regionInfo : regionInfoList) {
ADMIN.move(regionInfo.getEncodedNameAsBytes(), serverName0);
}
ADMIN.split(table2, "50".getBytes());
// Waiting briefly so that daughter regions are created but parent is not cleaned yet.
Thread.sleep(2000);
ADMIN.balancerSwitch(true, true);
try {
ADMIN.balanceRSGroup(pgroup);
} catch (IOException e) {
fail("Exception not expected. " + e);
}
}
} }