Author: szetszwo
Date: Tue Jul 5 17:28:27 2011
New Revision: 1143149
URL: http://svn.apache.org/viewvc?rev=1143149&view=rev
Log:
HADOOP-7090. Fix resource leaks in s3.INode, BloomMapFile, WritableUtils and
CBZip2OutputStream. Contributed by Uma Maheswara Rao G
Modified:
hadoop/common/trunk/common/CHANGES.txt
hadoop/common/trunk/common/src/java/org/apache/hadoop/fs/s3/INode.java
hadoop/common/trunk/common/src/java/org/apache/hadoop/io/BloomMapFile.java
hadoop/common/trunk/common/src/java/org/apache/hadoop/io/WritableUtils.java
hadoop/common/trunk/common/src/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java
Modified: hadoop/common/trunk/common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/common/CHANGES.txt?rev=1143149&r1=1143148&r2=1143149&view=diff
==============================================================================
--- hadoop/common/trunk/common/CHANGES.txt (original)
+++ hadoop/common/trunk/common/CHANGES.txt Tue Jul 5 17:28:27 2011
@@ -343,6 +343,9 @@ Trunk (unreleased changes)
HADOOP-7437. IOUtils.copybytes will suppress the stream closure exceptions.
(Uma Maheswara Rao G via szetszwo)
+ HADOOP-7090. Fix resource leaks in s3.INode, BloomMapFile, WritableUtils
+ and CBZip2OutputStream. (Uma Maheswara Rao G via szetszwo)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/common/src/java/org/apache/hadoop/fs/s3/INode.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/common/src/java/org/apache/hadoop/fs/s3/INode.java?rev=1143149&r1=1143148&r2=1143149&view=diff
==============================================================================
--- hadoop/common/trunk/common/src/java/org/apache/hadoop/fs/s3/INode.java
(original)
+++ hadoop/common/trunk/common/src/java/org/apache/hadoop/fs/s3/INode.java Tue
Jul 5 17:28:27 2011
@@ -27,6 +27,7 @@ import java.io.InputStream;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.io.IOUtils;
/**
* Holds file metadata including type (regular file, or directory),
@@ -82,15 +83,20 @@ public class INode {
public InputStream serialize() throws IOException {
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(bytes);
- out.writeByte(fileType.ordinal());
- if (isFile()) {
- out.writeInt(blocks.length);
- for (int i = 0; i < blocks.length; i++) {
- out.writeLong(blocks[i].getId());
- out.writeLong(blocks[i].getLength());
+ try {
+ out.writeByte(fileType.ordinal());
+ if (isFile()) {
+ out.writeInt(blocks.length);
+ for (int i = 0; i < blocks.length; i++) {
+ out.writeLong(blocks[i].getId());
+ out.writeLong(blocks[i].getLength());
+ }
}
+ out.close();
+ out = null;
+ } finally {
+ IOUtils.closeStream(out);
}
- out.close();
return new ByteArrayInputStream(bytes.toByteArray());
}
Modified:
hadoop/common/trunk/common/src/java/org/apache/hadoop/io/BloomMapFile.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/common/src/java/org/apache/hadoop/io/BloomMapFile.java?rev=1143149&r1=1143148&r2=1143149&view=diff
==============================================================================
--- hadoop/common/trunk/common/src/java/org/apache/hadoop/io/BloomMapFile.java
(original)
+++ hadoop/common/trunk/common/src/java/org/apache/hadoop/io/BloomMapFile.java
Tue Jul 5 17:28:27 2011
@@ -31,7 +31,6 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.SequenceFile.CompressionType;
import org.apache.hadoop.io.compress.CompressionCodec;
-import org.apache.hadoop.util.Options;
import org.apache.hadoop.util.Progressable;
import org.apache.hadoop.util.bloom.DynamicBloomFilter;
import org.apache.hadoop.util.bloom.Filter;
@@ -187,9 +186,14 @@ public class BloomMapFile {
public synchronized void close() throws IOException {
super.close();
DataOutputStream out = fs.create(new Path(dir, BLOOM_FILE_NAME), true);
- bloomFilter.write(out);
- out.flush();
- out.close();
+ try {
+ bloomFilter.write(out);
+ out.flush();
+ out.close();
+ out = null;
+ } finally {
+ IOUtils.closeStream(out);
+ }
}
}
@@ -225,15 +229,20 @@ public class BloomMapFile {
private void initBloomFilter(Path dirName,
Configuration conf) {
+
+ DataInputStream in = null;
try {
FileSystem fs = dirName.getFileSystem(conf);
- DataInputStream in = fs.open(new Path(dirName, BLOOM_FILE_NAME));
+ in = fs.open(new Path(dirName, BLOOM_FILE_NAME));
bloomFilter = new DynamicBloomFilter();
bloomFilter.readFields(in);
in.close();
+ in = null;
} catch (IOException ioe) {
LOG.warn("Can't open BloomFilter: " + ioe + " - fallback to MapFile.");
bloomFilter = null;
+ } finally {
+ IOUtils.closeStream(in);
}
}
Modified:
hadoop/common/trunk/common/src/java/org/apache/hadoop/io/WritableUtils.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/common/src/java/org/apache/hadoop/io/WritableUtils.java?rev=1143149&r1=1143148&r2=1143149&view=diff
==============================================================================
--- hadoop/common/trunk/common/src/java/org/apache/hadoop/io/WritableUtils.java
(original)
+++ hadoop/common/trunk/common/src/java/org/apache/hadoop/io/WritableUtils.java
Tue Jul 5 17:28:27 2011
@@ -62,8 +62,13 @@ public final class WritableUtils {
if (bytes != null) {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
GZIPOutputStream gzout = new GZIPOutputStream(bos);
- gzout.write(bytes, 0, bytes.length);
- gzout.close();
+ try {
+ gzout.write(bytes, 0, bytes.length);
+ gzout.close();
+ gzout = null;
+ } finally {
+ IOUtils.closeStream(gzout);
+ }
byte[] buffer = bos.toByteArray();
int len = buffer.length;
out.writeInt(len);
Modified:
hadoop/common/trunk/common/src/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/common/src/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java?rev=1143149&r1=1143148&r2=1143149&view=diff
==============================================================================
---
hadoop/common/trunk/common/src/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java
(original)
+++
hadoop/common/trunk/common/src/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java
Tue Jul 5 17:28:27 2011
@@ -27,6 +27,8 @@ package org.apache.hadoop.io.compress.bz
import java.io.OutputStream;
import java.io.IOException;
+import org.apache.hadoop.io.IOUtils;
+
/**
* An output stream that compresses into the BZip2 format (without the file
* header chars) into another stream.
@@ -727,8 +729,13 @@ public class CBZip2OutputStream extends
public void close() throws IOException {
if (out != null) {
OutputStream outShadow = this.out;
- finish();
- outShadow.close();
+ try {
+ finish();
+ outShadow.close();
+ outShadow = null;
+ } finally {
+ IOUtils.closeStream(outShadow);
+ }
}
}
