Skip to content

Commit 8cf2119

Browse files
committed
Removed init() method from StoreFileTrakcerBase.
Added check in FileBasedStoreFileTracker constructor to ignore null StoreContext or StoreContext instances that don't have store dir info.
1 parent ea2b45e commit 8cf2119

File tree

5 files changed

+3
-19
lines changed

5 files changed

+3
-19
lines changed

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/DefaultStoreFileTracker.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ public DefaultStoreFileTracker(Configuration conf, boolean isPrimaryReplica, Sto
3838
super(conf, isPrimaryReplica, ctx);
3939
}
4040

41-
@Override
42-
void init() {
43-
// NOOP
44-
}
45-
4641
@Override
4742
public List<StoreFileInfo> load() throws IOException {
4843
List<StoreFileInfo> files =

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/FileBasedStoreFileTracker.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,9 @@ class FileBasedStoreFileTracker extends StoreFileTrackerBase {
5656

5757
public FileBasedStoreFileTracker(Configuration conf, boolean isPrimaryReplica, StoreContext ctx) {
5858
super(conf, isPrimaryReplica, ctx);
59-
}
60-
61-
@Override
62-
void init() {
63-
backedFile = new StoreFileListFile(ctx);
59+
if (ctx != null && ctx.getFamilyStoreDirectoryPath() != null) {
60+
backedFile = new StoreFileListFile(ctx);
61+
}
6462
}
6563

6664
@Override

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/MigrationStoreFileTracker.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,8 @@ public MigrationStoreFileTracker(Configuration conf, boolean isPrimaryReplica, S
4747
super(conf, isPrimaryReplica, ctx);
4848
this.src = StoreFileTrackerFactory.createForMigration(conf, SRC_IMPL, isPrimaryReplica, ctx);
4949
this.dst = StoreFileTrackerFactory.createForMigration(conf, DST_IMPL, isPrimaryReplica, ctx);
50-
}
51-
52-
@Override
53-
void init() {
5450
Preconditions.checkArgument(!src.getClass().equals(dst.getClass()),
5551
"src and dst is the same: %s", src.getClass());
56-
this.src.init();
57-
this.dst.init();
5852
}
5953

6054
@Override

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileTrackerBase.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ protected StoreFileTrackerBase(Configuration conf, boolean isPrimaryReplica, Sto
6767
this.ctx = ctx;
6868
}
6969

70-
abstract void init();
71-
7270
@Override
7371
public final void add(Collection<StoreFileInfo> newFiles) throws IOException {
7472
if (isPrimaryReplica) {

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileTrackerFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ private static StoreFileTracker getInstance(Configuration conf, boolean isPrimar
110110
public static StoreFileTracker create(Configuration conf, boolean isPrimaryReplica,
111111
StoreContext ctx) {
112112
StoreFileTracker trackerImpl = getInstance(conf, isPrimaryReplica, ctx);
113-
((StoreFileTrackerBase)trackerImpl).init();
114113
return trackerImpl;
115114
}
116115

0 commit comments

Comments
 (0)