Skip to content

HBASE-30110 Fix for flapper in TestZooKeeper by AI #8116

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

Open
haridsv wants to merge 2 commits into
base: master
Choose a base branch
from
Open

HBASE-30110 Fix for flapper in TestZooKeeper by AI #8116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cc039c
HBASE-30110 Fix for flapper in TestZooKeeper by AI
haridsv Apr 10, 2026
dd76adc
Fix for deadlock by AI
haridsv Apr 24, 2026
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
35 changes: 14 additions & 21 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,15 @@
*/
package org.apache.hadoop.hbase.master;

import java.io.IOException;
import java.util.AbstractMap.SimpleImmutableEntry;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.master.RegionState;
import org.apache.hadoop.hbase.quotas.QuotaObserverChore;
import org.apache.hadoop.hbase.quotas.SpaceQuotaSnapshot;
import org.apache.hadoop.hbase.util.PairOfSameType;
Expand Down Expand Up @@ -217,26 +214,22 @@ Entry<Long, Long> convertSnapshot(SpaceQuotaSnapshot snapshot) {

@Override
public PairOfSameType<Integer> getRegionCounts() {
try {
if (!master.isInitialized()) {
return new PairOfSameType<>(0, 0);
if (!master.isInitialized() || master.getAssignmentManager() == null) {
return new PairOfSameType<>(0, 0);
}
int onlineRegionCount = 0;
int offlineRegionCount = 0;
for (RegionState rs : master.getAssignmentManager().getRegionStates().getRegionStates()) {
if (rs.getRegion().getTable().isSystemTable()) {
continue;
}
Integer onlineRegionCount = 0;
Integer offlineRegionCount = 0;

List<TableDescriptor> descriptors = master.listTableDescriptors(null, null, null, false);

for (TableDescriptor htDesc : descriptors) {
TableName tableName = htDesc.getTableName();
Map<RegionState.State, List<RegionInfo>> tableRegions =
master.getAssignmentManager().getRegionStates().getRegionByStateOfTable(tableName);
onlineRegionCount += tableRegions.get(RegionState.State.OPEN).size();
offlineRegionCount += tableRegions.get(RegionState.State.OFFLINE).size();
if (rs.isOpened()) {
onlineRegionCount++;
} else if (rs.isOffline()) {
offlineRegionCount++;
}
return new PairOfSameType<>(onlineRegionCount, offlineRegionCount);
} catch (IOException e) {
return new PairOfSameType<>(0, 0);
}
return new PairOfSameType<>(onlineRegionCount, offlineRegionCount);
}

@Override
Expand Down
1 change: 0 additions & 1 deletion hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ public static void setUpBeforeClass() throws Exception {
conf.setInt(HConstants.ZK_SESSION_TIMEOUT, 1000);
conf.setClass(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, MockLoadBalancer.class,
LoadBalancer.class);
TEST_UTIL.startMiniDFSCluster(2);
}

@AfterAll
Expand Down
Loading