Skip to content

HBASE-26790 getAllRegionLocations can cache locations with null hostname #4565

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
bbeaudreault merged 1 commit into from
Jun 23, 2022
Merged

HBASE-26790 getAllRegionLocations can cache locations with null hostname #4565

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
8 changes: 6 additions & 2 deletions hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableRegionLocatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,12 @@ public CompletableFuture<List<HRegionLocation>> getAllRegionLocations() {
}
CompletableFuture<List<HRegionLocation>> future = ClientMetaTableAccessor
.getTableHRegionLocations(conn.getTable(TableName.META_TABLE_NAME), tableName);
addListener(future, (locs, error) -> locs
.forEach(loc -> conn.getLocator().getNonMetaRegionLocator().addLocationToCache(loc)));
addListener(future, (locs, error) -> locs.forEach(loc -> {
// the cache assumes that all locations have a serverName. only add if that's true
if (loc.getServerName() != null) {
conn.getLocator().getNonMetaRegionLocator().addLocationToCache(loc);
}
}));
return future;
}, getClass().getSimpleName() + ".getAllRegionLocations");
}
Expand Down
49 changes: 49 additions & 0 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNonMetaRegionLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;

import java.io.IOException;
Expand All @@ -41,6 +42,7 @@
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.MetaTableAccessor;
import org.apache.hadoop.hbase.NotServingRegionException;
import org.apache.hadoop.hbase.RegionLocations;
import org.apache.hadoop.hbase.ServerName;
Expand All @@ -52,6 +54,7 @@
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.ServerRegionReplicaUtil;
import org.junit.After;
import org.junit.AfterClass;
Expand All @@ -64,6 +67,7 @@
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;

import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
import org.apache.hbase.thirdparty.com.google.common.io.Closeables;

@Category({ MediumTests.class, ClientTests.class })
Expand Down Expand Up @@ -476,4 +480,49 @@ public void testCacheLocationWhenGetAllLocations() throws Exception {
assertNotNull(conn.getLocator().getRegionLocationInCache(TABLE_NAME, region.getStartKey()));
}
}

@Test
public void testDoNotCacheLocationWithNullServerNameWhenGetAllLocations() throws Exception {
createMultiRegionTable();
AsyncConnectionImpl conn = (AsyncConnectionImpl) ConnectionFactory
.createAsyncConnection(TEST_UTIL.getConfiguration()).get();
List<RegionInfo> regions = TEST_UTIL.getAdmin().getRegions(TABLE_NAME);
RegionInfo chosen = regions.get(0);

// re-populate region cache
AsyncTableRegionLocator regionLocator = conn.getRegionLocator(TABLE_NAME);
regionLocator.clearRegionLocationCache();
regionLocator.getAllRegionLocations().get();

// expect all to be non-null at first
checkRegions(conn, regions, null);

// clear servername from region info
Put put = MetaTableAccessor.makePutFromRegionInfo(chosen, EnvironmentEdgeManager.currentTime());
MetaTableAccessor.addEmptyLocation(put, 0);
MetaTableAccessor.putsToMetaTable(TEST_UTIL.getConnection(), Lists.newArrayList(put));

// re-populate region cache again. check that we succeeded in nulling the servername
regionLocator.clearRegionLocationCache();
for (HRegionLocation loc : regionLocator.getAllRegionLocations().get()) {
if (loc.getRegion().equals(chosen)) {
assertNull(loc.getServerName());
}
}

// expect all but chosen to be non-null. chosen should be null because serverName was null
checkRegions(conn, regions, chosen);
}

private void checkRegions(AsyncConnectionImpl conn, List<RegionInfo> regions, RegionInfo chosen) {
for (RegionInfo region : regions) {
RegionLocations fromCache =
conn.getLocator().getRegionLocationInCache(TABLE_NAME, region.getStartKey());
if (region.equals(chosen)) {
assertNull(fromCache);
} else {
assertNotNull(fromCache);
}
}
}
}