gvprathyusha6 commented on code in PR #8013: URL: https://github.com/apache/hbase/pull/8013#discussion_r3018619904
########## hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestRestoreSnapshotProcedureFileBasedSFT.java: ########## @@ -0,0 +1,268 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.master.procedure; + +import static org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTrackerFactory.TRACKER_IMPL; +import static org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTrackerFactory.Trackers.FILE; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.util.List; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.HBaseClassTestRule; +import org.apache.hadoop.hbase.HBaseTestingUtil; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.RegionInfo; +import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.CommonFSUtils; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Integration test for RestoreSnapshotProcedure with FileBasedStoreFileTracker. + * Verifies the end-to-end restore snapshot flow works correctly when the FILE-based + * StoreFileTracker is in use. Uses HBaseTestingUtil to start an in-process mini + * HBase cluster to exercise the restoreRegion() code path in RestoreSnapshotHelper. + */ +@Category({ MasterTests.class, LargeTests.class }) +public class TestRestoreSnapshotProcedureFileBasedSFT { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestRestoreSnapshotProcedureFileBasedSFT.class); + + private static final Logger LOG = + LoggerFactory.getLogger(TestRestoreSnapshotProcedureFileBasedSFT.class); + + private static final HBaseTestingUtil UTIL = new HBaseTestingUtil(); + private static final byte[] CF = Bytes.toBytes("cf"); + + /** The .filelist directory name used by FileBasedStoreFileTracker. */ + private static final String FILELIST_DIR = ".filelist"; + + @BeforeClass + public static void setupCluster() throws Exception { + Configuration conf = UTIL.getConfiguration(); + conf.set(TRACKER_IMPL, FILE.name()); + conf.setInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 1); + UTIL.startMiniCluster(3); + } + + @AfterClass + public static void tearDownCluster() throws Exception { + UTIL.shutdownMiniCluster(); + } + + /** + * Test that reproduces the scenario where restore fails with FileNotFoundException: + * 1. Create table with FILE tracker, load data, snapshot + * 2. Load more data + flush (creates new HFiles not in snapshot) + * 3. Restore from snapshot + * 4. Verify all regions open and data matches the snapshot + * + * Before the fix, step 4 would fail with FileNotFoundException because + * the .filelist still referenced the post-snapshot HFiles that were + * archived during restore. + */ + @Test + public void testRestoreSnapshotWithFileTrackerAfterDataChange() throws Exception { + Admin admin = UTIL.getAdmin(); + TableName tableName = TableName.valueOf("testRestoreWithFileTracker"); + String snapshotName = "snapshot-before-change"; + + try { + // Step 1: Create table, load initial data, take snapshot + SnapshotTestingUtils.createTable(UTIL, tableName, 1, CF); + SnapshotTestingUtils.loadData(UTIL, tableName, 500, CF); + + int snapshotRowCount; + try (Table table = UTIL.getConnection().getTable(tableName)) { + snapshotRowCount = UTIL.countRows(table); + } + LOG.info("Snapshot row count: {}", snapshotRowCount); + assertTrue("Should have loaded data", snapshotRowCount > 0); + + admin.disableTable(tableName); + admin.snapshot(snapshotName, tableName); + admin.enableTable(tableName); + + // Step 2: Load more data and flush to create new HFiles. + // These new HFiles will NOT be in the snapshot. + SnapshotTestingUtils.loadData(UTIL, tableName, 500, CF); + admin.flush(tableName); + + int postFlushRowCount; + try (Table table = UTIL.getConnection().getTable(tableName)) { + postFlushRowCount = UTIL.countRows(table); + } + LOG.info("Post-flush row count: {} (snapshot had {})", postFlushRowCount, + snapshotRowCount); + assertTrue("Should have more rows after loading more data", + postFlushRowCount > snapshotRowCount); + + // Step 3: Disable and restore from the earlier snapshot. + // restoreRegion() must update .filelist to point to the snapshot's HFiles. + admin.disableTable(tableName); + admin.restoreSnapshot(snapshotName); + + // Step 4: Enable table, triggers region opens. + admin.enableTable(tableName); + + // Verify all regions are online + List<RegionInfo> regions = admin.getRegions(tableName); + LOG.info("Number of regions after restore: {}", regions.size()); + assertTrue("Table should have at least one region", regions.size() > 0); + + // Verify data matches the snapshot (not the post-flush state) + SnapshotTestingUtils.verifyRowCount(UTIL, tableName, snapshotRowCount); + LOG.info("Data verification passed: row count matches snapshot ({})", + snapshotRowCount); + + // Verify .filelist files exist on disk for each region + verifyFileListExists(tableName); + + } finally { + if (admin.tableExists(tableName)) { + if (!admin.isTableDisabled(tableName)) { + admin.disableTable(tableName); + } + admin.deleteTable(tableName); + } + SnapshotTestingUtils.deleteAllSnapshots(admin); + SnapshotTestingUtils.deleteArchiveDirectory(UTIL); + } + } + + /** + * Test restore after compaction, compaction creates new HFiles that replace + * the originals. After restore, the .filelist must point to the snapshot's + * HFiles, not the compaction output. + */ + @Test + public void testRestoreSnapshotAfterCompaction() throws Exception { Review Comment: this as well, since the global SFT config itself is FILE, this should work, but looks like an issue with the test, it fails at this assert https://github.com/apache/hbase/pull/8013/changes#diff-66c1760bfcfc64f561b37dd18df6a41595e93d1c516a326de27ad6e9c631ebb2R266 it should be failing [here](https://github.com/apache/hbase/pull/8013/changes#diff-66c1760bfcfc64f561b37dd18df6a41595e93d1c516a326de27ad6e9c631ebb2R253) instead? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
