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:
parent
d3ccbd8e65
commit
7d168d9ff9
@ -473,19 +473,20 @@ void writeStreamToFile(InputStream in, PathData target,
|
||||
FSDataOutputStream create(PathData item, boolean lazyPersist)
|
||||
throws IOException {
|
||||
try {
|
||||
EnumSet<CreateFlag> createFlags = EnumSet.of(CREATE);
|
||||
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
|
||||
deleteOnExit(item.path);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user