Skip to content

HBASE-30381 MOB snapshot scanning fails on branch-2.5 after HBASE-29662 #8650

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
liuxiaocs7 merged 2 commits into from
Sep 16, 2026
Merged

HBASE-30381 MOB snapshot scanning fails on branch-2.5 after HBASE-29662 #8650

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
1075532
HBASE-30381 MOB snapshot scanning fails on branch-2.5 after HBASE-29662
liuxiaocs7 Sep 15, 2026
6d70b78
update
liuxiaocs7 Sep 15, 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
6 changes: 6 additions & 0 deletions ...preduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.apache.hadoop.hbase.client.Scan.ReadType;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.mob.MobUtils;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.snapshot.RestoreSnapshotHelper;
import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils;
Expand Down Expand Up @@ -361,6 +362,11 @@ public static List<HRegionInfo> getRegionInfosFromManifest(SnapshotManifest mani
if (hri.isOffline() && (hri.isSplit() || hri.isSplitParent())) {
continue;
}
// The mob region is a dummy region used only to organise mob files under mobdir. It has no
// region directory under the table dir to open. See HBASE-30381.
if (MobUtils.isMobRegionInfo(hri)) {
continue;
}
regionInfos.add(hri);
}
return regionInfos;
Expand Down
2 changes: 1 addition & 1 deletion hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCopyTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public void testLoadingTtlExpiredSnapshotToTable() throws Exception {
}

@Test
public void tsetLoadingSnapshotToMobTable() throws Exception {
public void testLoadingSnapshotToMobTable() throws Exception {
testCopyTableBySnapshot("testLoadingSnapshotToMobTable", false, true);
}

Expand Down
6 changes: 6 additions & 0 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/client/TableSnapshotScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.PrivateCellUtil;
import org.apache.hadoop.hbase.client.metrics.ScanMetrics;
import org.apache.hadoop.hbase.mob.MobUtils;
import org.apache.hadoop.hbase.regionserver.MemStoreLAB;
import org.apache.hadoop.hbase.snapshot.RestoreSnapshotHelper;
import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils;
Expand Down Expand Up @@ -160,6 +161,11 @@ private boolean isValidRegion(RegionInfo hri) {
if (hri.isOffline() && (hri.isSplit() || hri.isSplitParent())) {
return false;
}
// The mob region is a dummy region used only to organise mob files under mobdir. It has no
// region directory under the table dir to open. See HBASE-30381.
if (MobUtils.isMobRegionInfo(hri)) {
return false;
}
return PrivateCellUtil.overlappingKeys(scan.getStartRow(), scan.getStopRow(), hri.getStartKey(),
hri.getEndKey());
}
Expand Down
26 changes: 26 additions & 0 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTableSnapshotScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.HRegionFileSystem;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.snapshot.MobSnapshotTestingUtils;
import org.apache.hadoop.hbase.snapshot.RestoreSnapshotHelper;
import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;
import org.apache.hadoop.hbase.testclassification.ClientTests;
Expand Down Expand Up @@ -370,6 +371,31 @@ public void testScannerWithRestoreScanner() throws Exception {
}
}

@Test
public void testScannerWithRestoredMobSnapshot() throws Exception {
TableName tableName = TableName.valueOf(methodName);
String snapshotName = methodName + "Snapshot";
Path restoreDir = UTIL.getDataTestDirOnTestFS(snapshotName);
try {
MobSnapshotTestingUtils.createMobTable(UTIL, tableName, new byte[0][], 1, FAMILIES);
try (Table table = UTIL.getConnection().getTable(tableName)) {
UTIL.loadTable(table, FAMILIES);
}
UTIL.getAdmin().snapshot(snapshotName, tableName);

Configuration conf = UTIL.getConfiguration();
RestoreSnapshotHelper.copySnapshotForScanner(conf, fs, rootDir, restoreDir, snapshotName);
try (TableSnapshotScanner scanner = new TableSnapshotScanner(conf, rootDir, restoreDir,
snapshotName, new Scan().withStartRow(Bytes.toBytes("zzzz")), true)) {
assertNull(scanner.next());
}
} finally {
fs.delete(restoreDir, true);
UTIL.getAdmin().deleteSnapshot(snapshotName);
UTIL.deleteTable(tableName);
}
}

private void testScanner(HBaseTestingUtility util, String snapshotName, int numRegions,
boolean shutdownCluster) throws Exception {
TableName tableName = TableName.valueOf("testScanner");
Expand Down