From 7d337edb0d83f24ffdea885d2d19ed7e3a3f6be6 Mon Sep 17 00:00:00 2001 From: Adrian Muraru Date: Wed, 7 Mar 2018 10:48:28 +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 9f3d9bd58f..fe8c6c1e8d 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 @@ -6804,7 +6804,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); @@ -6906,7 +6906,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); } @@ -7077,7 +7077,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