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

HDFS-7079. Few more unit test fixes for HDFS-6581. (Arpit Agarwal) 

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
This commit is contained in:
arp 2014-09-16 18:19:57 -07:00 committed by Jitendra Pandey
parent 5f86ce7ea9
commit e4ef0023b8
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandWithDestination.java
View File

@ -473,10 +473,8 @@ abstract class CommandWithDestination extends FsCommand {
FSDataOutputStream create(PathData item, boolean lazyPersist) FSDataOutputStream create(PathData item, boolean lazyPersist)
throws IOException { throws IOException {
try { try {
EnumSet<CreateFlag> createFlags = EnumSet.of(CREATE);
if (lazyPersist) { if (lazyPersist) {
createFlags.add(LAZY_PERSIST); EnumSet<CreateFlag> createFlags = EnumSet.of(CREATE, LAZY_PERSIST);
}
return create(item.path, return create(item.path,
FsPermission.getFileDefault().applyUMask( FsPermission.getFileDefault().applyUMask(
FsPermission.getUMask(getConf())), FsPermission.getUMask(getConf())),
@ -486,6 +484,9 @@ abstract class CommandWithDestination extends FsCommand {
getDefaultBlockSize(), getDefaultBlockSize(),
null, null,
null); null);
} else {
return create(item.path, true);
}
} finally { // might have been created but stream was interrupted } finally { // might have been created but stream was interrupted
deleteOnExit(item.path); deleteOnExit(item.path);
} }