From bcc01aabab5a70d4fa57a8553b0117f8d3e30feb Mon Sep 17 00:00:00 2001 From: Adrian Muraru Date: Tue, 6 Mar 2018 16:22:14 +0200 Subject: [PATCH] HBASE-20140 - HRegion FileSystem should be instantiated from hbase rootDir not default --- .../src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index f071baf14a..702d105d39 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -6815,7 +6815,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi LOG.info("creating HRegion " + info.getTable().getNameAsString() + " HTD == " + hTableDescriptor + " RootDir = " + rootDir + " Table name == " + info.getTable().getNameAsString()); - FileSystem fs = FileSystem.get(conf); + 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); @@ -6917,7 +6917,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi fs = rsServices.getFileSystem(); } if (fs == null) { - fs = FileSystem.get(conf); + fs = rootDir.getFileSystem(conf); } return openHRegion(conf, fs, rootDir, info, htd, wal, rsServices, reporter); } @@ -7088,7 +7088,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi fs = rsServices.getFileSystem(); } if (fs == null) { - fs = FileSystem.get(conf); + fs = rootDir.getFileSystem(conf); } HRegion r = HRegion.newHRegion(tableDir, wal, fs, conf, info, htd, null); -- 2.16.2