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)

This commit is contained in:
arp 2014-09-16 18:19:57 -07:00
parent a24a9331d4
commit dcbc467301
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,19 +473,20 @@ 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,
FsPermission.getFileDefault().applyUMask(
FsPermission.getUMask(getConf())),
createFlags,
getConf().getInt("io.file.buffer.size", 4096),
lazyPersist ? 1 : getDefaultReplication(item.path),
getDefaultBlockSize(),
null,
null);
} else {
return create(item.path, true);
} }
return create(item.path,
FsPermission.getFileDefault().applyUMask(
FsPermission.getUMask(getConf())),
createFlags,
getConf().getInt("io.file.buffer.size", 4096),
lazyPersist ? 1 : getDefaultReplication(item.path),
getDefaultBlockSize(),
null,
null);
} finally { // might have been created but stream was interrupted } finally { // might have been created but stream was interrupted
deleteOnExit(item.path); deleteOnExit(item.path);
} }

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
View File

@ -50,4 +50,6 @@
HDFS-7064. Fix unit test failures in HDFS-6581 branch. (Xiaoyu Yao via HDFS-7064. Fix unit test failures in HDFS-6581 branch. (Xiaoyu Yao via
Arpit Agarwal) Arpit Agarwal)
HDFS-6581. Few more unit test fixes for HDFS-6581. (Arpit Agarwal)