From c71285f0ae46c181d1471c491517ba0dcd24d1ae Mon Sep 17 00:00:00 2001 From: Peter Somogyi Date: Tue, 6 Aug 2019 17:10:56 +0200 Subject: [PATCH] HBASE-22771 [HBCK2] fixMeta method and server-side support; ADDENDUM (#457) Remove HRegion.java.rej file --- .../hadoop/hbase/regionserver/HRegion.java.rej | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java.rej diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java.rej b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java.rej deleted file mode 100644 index 4d914013791..00000000000 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java.rej +++ /dev/null @@ -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);