From 1523031de5fcdac4c0c56e23d1b8cf6d813c93d6 Mon Sep 17 00:00:00 2001 From: Esteban Gutierrez Date: Wed, 20 Dec 2017 14:13:59 -0600 Subject: [PATCH] HBASE-19391 Calling HRegion#initializeRegionInternals from a region replica can still re-create a region directory --- .../hbase/regionserver/HRegionFileSystem.java | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java index 4fc9ffe5cd..662e61e6af 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java @@ -968,28 +968,29 @@ public class HRegionFileSystem { public static HRegionFileSystem createRegionOnFileSystem(final Configuration conf, final FileSystem fs, final Path tableDir, final RegionInfo regionInfo) throws IOException { HRegionFileSystem regionFs = new HRegionFileSystem(conf, fs, tableDir, regionInfo); - Path regionDir = regionFs.getRegionDir(); - if (fs.exists(regionDir)) { - LOG.warn("Trying to create a region that already exists on disk: " + regionDir); - throw new IOException("The specified region already exists on disk: " + regionDir); - } + // We only create a .regioninfo and the region directory if this is the default region replica + if (regionInfo.getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID) { + Path regionDir = regionFs.getRegionDir(); + if (fs.exists(regionDir)) { + LOG.warn("Trying to create a region that already exists on disk: " + regionDir); + throw new IOException("The specified region already exists on disk: " + regionDir); + } - // Create the region directory - if (!createDirOnFileSystem(fs, conf, regionDir)) { - LOG.warn("Unable to create the region directory: " + regionDir); - throw new IOException("Unable to create region directory: " + regionDir); - } + // Create the region directory + if (!createDirOnFileSystem(fs, conf, regionDir)) { + LOG.warn("Unable to create the region directory: " + regionDir); + throw new IOException("Unable to create region directory: " + regionDir); + } - // Write HRI to a file in case we need to recover hbase:meta - // Only primary replicas should write region info - if (regionInfo.getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID) { + // Write HRI to a file in case we need to recover hbase:meta regionFs.writeRegionInfoOnFilesystem(false); + return regionFs; } else { if (LOG.isDebugEnabled()) LOG.debug("Skipping creation of .regioninfo file for " + regionInfo); } - return regionFs; + return null; } /** -- 2.15.1