Skip to content

Commit 82880cd

Browse files
authored
Revert "HBASE-27017: MOB snapshot is broken when FileBased SFT is used (apache#4466)"
This reverts commit f0cbbc7.
1 parent 67204fc commit 82880cd

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifest.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.apache.hadoop.fs.FileSystem;
3737
import org.apache.hadoop.fs.Path;
3838
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
39-
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
4039
import org.apache.hadoop.hbase.client.RegionInfo;
4140
import org.apache.hadoop.hbase.client.TableDescriptor;
4241
import org.apache.hadoop.hbase.errorhandling.ForeignExceptionSnare;
@@ -311,17 +310,7 @@ protected void addRegion(Path tableDir, RegionInfo regionInfo, RegionVisitor vis
311310
for (ColumnFamilyDescriptor cfd : htd.getColumnFamilies()) {
312311
Object familyData = visitor.familyOpen(regionData, cfd.getName());
313312
monitor.rethrowException();
314-
StoreFileTracker tracker = null;
315-
if (isMobRegion) {
316-
// MOB regions are always using the default SFT implementation
317-
ColumnFamilyDescriptor defaultSFTCfd = ColumnFamilyDescriptorBuilder.newBuilder(cfd)
318-
.setValue(StoreFileTrackerFactory.TRACKER_IMPL,
319-
StoreFileTrackerFactory.Trackers.DEFAULT.name())
320-
.build();
321-
tracker = StoreFileTrackerFactory.create(conf, htd, defaultSFTCfd, regionFs);
322-
} else {
323-
tracker = StoreFileTrackerFactory.create(conf, htd, cfd, regionFs);
324-
}
313+
StoreFileTracker tracker = StoreFileTrackerFactory.create(conf, htd, cfd, regionFs);
325314
List<StoreFileInfo> storeFiles = tracker.load();
326315
if (storeFiles.isEmpty()) {
327316
LOG.debug("No files under family: {}", cfd.getNameAsString());

0 commit comments

Comments
 (0)