[ https://issues.apache.org/jira/browse/HADOOP-9507?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Chris Nauroth updated HADOOP-9507: ---------------------------------- Attachment: HADOOP-9507-trunk.2.patch I'm uploading version 2 of the trunk patch to fix the javac deprecation warning. Here is the incremental diff: {code} diff --git hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java hadoop-common-projec index 2ee6c70..6b45fe3 100644 --- hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java +++ hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java @@ -332,7 +332,7 @@ public boolean rename(Path src, Path dst) throws IOException { // fails. Copy source content to destination and delete source. if (this.exists(dst)) { FileStatus sdst = this.getFileStatus(dst); - if (sdst.isDir() && dstFile.list().length == 0) { + if (sdst.isDirectory() && dstFile.list().length == 0) { if (LOG.isDebugEnabled()) { LOG.debug("Copying contents of " + src + " to " + dst); } {code} On branch-1, we don't have {{FileStatus#isDirectory}}, and {{FileStatus#isDir}} is not deprecated. Therefore, we don't need to update the branch-1 and branch-1-win patches. > LocalFileSystem rename() is broken in some cases when destination exists > ------------------------------------------------------------------------ > > Key: HADOOP-9507 > URL: https://issues.apache.org/jira/browse/HADOOP-9507 > Project: Hadoop Common > Issue Type: Bug > Components: fs > Affects Versions: 3.0.0, 1-win, 2.1.0-beta, 1.3.0 > Reporter: Mostafa Elhemali > Assignee: Chris Nauroth > Priority: Minor > Attachments: HADOOP-9507-branch-1.1.patch, > HADOOP-9507-branch-1-win.1.patch, HADOOP-9507.branch-1-win.patch, > HADOOP-9507-trunk.1.patch, HADOOP-9507-trunk.2.patch > > > The rename() method in RawLocalFileSystem uses FileUtil.copy() without > realizing that FileUtil.copy() has a special behavior that if you're copying > /foo to /bar and /bar exists and is a directory, it'll copy /foo inside /bar > instead of overwriting it, which is not what rename() wants. So you end up > with weird behaviors like in this repro: > {code} > c: > cd \ > md Foo > md Bar > md Foo\X > md Bar\X > hadoop fs -mv file:///c:/Foo file:///c:/Bar > {code} > At the end of this, you would expect to find only Bar\X, but you instead find > Bar\X\X. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira