Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22771 [HBCK2] fixMeta method and server-side support; ADDENDUM (#457) 

Remove HRegion.java.rej file
This commit is contained in:
Peter Somogyi 2019-08-06 17:10:56 +02:00 committed by Michael Stack
parent 935d271f77
commit c71285f0ae
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java.rej
View File

@ -1,18 +0,0 @@
diff a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (rejected hunks)
@@ -7073,12 +7073,12 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
final Configuration conf, final TableDescriptor hTableDescriptor,
final WAL wal, final boolean initialize)
throws IOException {
- LOG.info("creating HRegion " + info.getTable().getNameAsString()
- + " HTD == " + hTableDescriptor + " RootDir = " + rootDir +
- " Table name == " + info.getTable().getNameAsString());
+ LOG.info("creating " + info
+ + ", tableDescriptor=" + (hTableDescriptor == null? "null": hTableDescriptor) +
+ ", regionDir=" + rootDir);
+ createRegionDir(conf, info, rootDir);
FileSystem fs = rootDir.getFileSystem(conf);
Path tableDir = FSUtils.getTableDir(rootDir, info.getTable());
- HRegionFileSystem.createRegionOnFileSystem(conf, fs, tableDir, info);
HRegion region = HRegion.newHRegion(tableDir, wal, fs, conf, info, hTableDescriptor, null);
if (initialize) {
region.initialize(null);