Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-1481: Cleanup BasicOzoneFileSystem#mkdir (#1114)

This commit is contained in:
Lokesh Jain 2019-07-18 14:40:45 +05:30 committed by GitHub
parent 3dc256ef81
commit 53a4c22b40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java
View File

@ -563,51 +563,14 @@ public class BasicOzoneFileSystem extends FileSystem {
} }
/** /**
* Check whether the path is valid and then create directories. * Creates a directory. Directory is represented using a key with no value.
* Directory is represented using a key with no value.
* All the non-existent parent directories are also created.
* *
* @param path directory path to be created * @param path directory path to be created
* @return true if directory exists or created successfully. * @return true if directory exists or created successfully.
* @throws IOException * @throws IOException
*/ */
private boolean mkdir(Path path) throws IOException { private boolean mkdir(Path path) throws IOException {
Path fPart = path; return adapter.createDirectory(pathToKey(path));
Path prevfPart = null;
do {
LOG.trace("validating path:{}", fPart);
try {
FileStatus fileStatus = getFileStatus(fPart);
if (fileStatus.isDirectory()) {
// If path exists and a directory, exit
break;
} else {
// Found a file here, rollback and delete newly created directories
LOG.trace("Found a file with same name as directory, path:{}", fPart);
if (prevfPart != null) {
delete(prevfPart, true);
}
throw new FileAlreadyExistsException(String.format(
"Can't make directory for path '%s', it is a file.", fPart));
}
} catch (FileNotFoundException | OMException fnfe) {
LOG.trace("creating directory for fpart:{}", fPart);
String key = pathToKey(fPart);
String dirKey = addTrailingSlashIfNeeded(key);
if (!adapter.createDirectory(dirKey)) {
// Directory creation failed here,
// rollback and delete newly created directories
LOG.trace("Directory creation failed, path:{}", fPart);
if (prevfPart != null) {
delete(prevfPart, true);
}
return false;
}
}
prevfPart = fPart;
fPart = fPart.getParent();
} while (fPart != null);
return true;
} }
@Override @Override