Apache9 commented on a change in pull request #3574:
URL: https://github.com/apache/hbase/pull/3574#discussion_r688434905
##########
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
##########
@@ -638,47 +598,36 @@ void cleanupDaughterRegion(final RegionInfo regionInfo)
throws IOException {
*/
public Path commitDaughterRegion(final RegionInfo regionInfo)
throws IOException {
- Path regionDir = new Path(this.tableDir, regionInfo.getEncodedName());
- Path daughterTmpDir = this.getSplitsDir(regionInfo);
-
- if (fs.exists(daughterTmpDir)) {
-
+ Path regionDir = this.getSplitsDir(regionInfo);
+ if (fs.exists(regionDir)) {
// Write HRI to a file in case we need to recover hbase:meta
- Path regionInfoFile = new Path(daughterTmpDir, REGION_INFO_FILE);
+ Path regionInfoFile = new Path(regionDir, REGION_INFO_FILE);
byte[] regionInfoContent = getRegionInfoFileContent(regionInfo);
writeRegionInfoFileContent(conf, fs, regionInfoFile, regionInfoContent);
-
- // Move the daughter temp dir to the table dir
- if (!rename(daughterTmpDir, regionDir)) {
- throw new IOException("Unable to rename " + daughterTmpDir + " to " +
regionDir);
- }
}
return regionDir;
}
/**
- * Create the region splits directory.
+ * Creates region split daughter directories under the table dir. If the
daughter regions already
+ * exist, for example, in the case of a recovery from a previous failed
split procedure, this
+ * method deletes the given region dir recursively, then recreates it again.
*/
public void createSplitsDir(RegionInfo daughterA, RegionInfo daughterB)
throws IOException {
- Path splitdir = getSplitsDir();
- if (fs.exists(splitdir)) {
- LOG.info("The " + splitdir + " directory exists. Hence deleting it to
recreate it");
- if (!deleteDir(splitdir)) {
- throw new IOException("Failed deletion of " + splitdir + " before
creating them again.");
- }
+ Path daughterADir = getSplitsDir(daughterA);
+ if (fs.exists(daughterADir)) {
+ fs.delete(daughterADir, true);
Review comment:
We do not use the deleteDir method in HRegionFileSystem? Seems it is
better to keep the old way, test the return value of deleteDir and throw
IOException?
##########
File path:
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionFileSystem.java
##########
@@ -70,6 +70,7 @@
private static final Logger LOG =
LoggerFactory.getLogger(TestHRegionFileSystem.class);
public static final byte[] FAMILY_NAME = Bytes.toBytes("info");
+
Review comment:
Do not need to modify this file?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
