HDFS-12881. Output streams closed with IOUtils suppressing write errors. Contributed by Ajay Kumar
This commit is contained in:
parent
2564b4d07f
commit
80db744ee5
|
@ -1086,8 +1086,10 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> {
|
||||||
// calculate and write the last crc
|
// calculate and write the last crc
|
||||||
checksum.calculateChunkedSums(data, 0, offset, crcs, 0);
|
checksum.calculateChunkedSums(data, 0, offset, crcs, 0);
|
||||||
metaOut.write(crcs, 0, 4);
|
metaOut.write(crcs, 0, 4);
|
||||||
|
metaOut.close();
|
||||||
|
metaOut = null;
|
||||||
} finally {
|
} finally {
|
||||||
IOUtils.cleanup(null, metaOut);
|
IOUtils.closeStream(metaOut);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -108,6 +108,8 @@ public abstract class FSImageTestUtil {
|
||||||
try {
|
try {
|
||||||
raf.seek(IMAGE_TXID_POS);
|
raf.seek(IMAGE_TXID_POS);
|
||||||
raf.writeLong(0);
|
raf.writeLong(0);
|
||||||
|
raf.close();
|
||||||
|
raf = null;
|
||||||
} finally {
|
} finally {
|
||||||
IOUtils.closeStream(raf);
|
IOUtils.closeStream(raf);
|
||||||
}
|
}
|
||||||
|
@ -542,9 +544,12 @@ public abstract class FSImageTestUtil {
|
||||||
|
|
||||||
out = new FileOutputStream(versionFile);
|
out = new FileOutputStream(versionFile);
|
||||||
props.store(out, null);
|
props.store(out, null);
|
||||||
|
out.close();
|
||||||
|
out = null;
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
IOUtils.cleanup(null, fis, out);
|
IOUtils.closeStream(fis);
|
||||||
|
IOUtils.closeStream(out);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -340,9 +340,11 @@ public class TestOfflineImageViewer {
|
||||||
in = new FileInputStream(src);
|
in = new FileInputStream(src);
|
||||||
out = new FileOutputStream(dest);
|
out = new FileOutputStream(dest);
|
||||||
in.getChannel().transferTo(0, MAX_BYTES, out.getChannel());
|
in.getChannel().transferTo(0, MAX_BYTES, out.getChannel());
|
||||||
|
out.close();
|
||||||
|
out = null;
|
||||||
} finally {
|
} finally {
|
||||||
IOUtils.cleanup(null, in);
|
IOUtils.closeStream(in);
|
||||||
IOUtils.cleanup(null, out);
|
IOUtils.closeStream(out);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue