Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[HADOOP-19341] HDFS Client's direct memory leaks with erasure coding enabled #7168

Open
wants to merge 6 commits into
base: trunk
Choose a base branch
from
Open

[HADOOP-19341] HDFS Client's direct memory leaks with erasure coding enabled #7168

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a3c7fe7
replace ElasticByteBufferPool with WeakReferencedElasticByteBufferPool
terence-yoo Nov 18, 2024
2151ea2
add a test case for ElasticByteBufferPool
terence-yoo Nov 19, 2024
9d5bc0a
remove unused codes
terence-yoo Nov 19, 2024
3fec6d2
retrigger checks
terence-yoo Nov 19, 2024
943fdc3
reuse existing tests
terence-yoo Nov 21, 2024
a046e97
retrigger
terence-yoo Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ommon-project/hadoop-common/src/main/java/org/apache/hadoop/io/ElasticByteBufferPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
*/
@InterfaceAudience.Public
@InterfaceStability.Stable
public class ElasticByteBufferPool implements ByteBufferPool {
public abstract class ElasticByteBufferPool implements ByteBufferPool {
EungsopYoo marked this conversation as resolved.
Show resolved Hide resolved
protected static final class Key implements Comparable<Key> {
private final int capacity;
private final long insertionTime;
Expand Down
4 changes: 2 additions & 2 deletions ...roject/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import org.apache.hadoop.hdfs.util.StripedBlockUtil.StripeRange;
import org.apache.hadoop.io.ByteBufferPool;

import org.apache.hadoop.io.ElasticByteBufferPool;
import org.apache.hadoop.io.WeakReferencedElasticByteBufferPool;
import org.apache.hadoop.io.erasurecode.CodecUtil;
import org.apache.hadoop.hdfs.protocol.ErasureCodingPolicy;

Expand Down Expand Up @@ -64,7 +64,7 @@
@InterfaceAudience.Private
public class DFSStripedInputStream extends DFSInputStream {

private static final ByteBufferPool BUFFER_POOL = new ElasticByteBufferPool();
private static final ByteBufferPool BUFFER_POOL = new WeakReferencedElasticByteBufferPool();
private final BlockReaderInfo[] blockReaders;
private final int cellSize;
private final short dataBlkNum;
Expand Down
4 changes: 2 additions & 2 deletions ...oject/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
import org.apache.hadoop.hdfs.protocol.datatransfer.BlockConstructionStage;
import org.apache.hadoop.hdfs.util.StripedBlockUtil;
import org.apache.hadoop.io.ByteBufferPool;
import org.apache.hadoop.io.ElasticByteBufferPool;
import org.apache.hadoop.io.MultipleIOException;
import org.apache.hadoop.io.WeakReferencedElasticByteBufferPool;
import org.apache.hadoop.io.erasurecode.CodecUtil;
import org.apache.hadoop.io.erasurecode.ErasureCoderOptions;
import org.apache.hadoop.io.erasurecode.rawcoder.RawErasureEncoder;
Expand Down Expand Up @@ -83,7 +83,7 @@
@InterfaceAudience.Private
public class DFSStripedOutputStream extends DFSOutputStream
implements StreamCapabilities {
private static final ByteBufferPool BUFFER_POOL = new ElasticByteBufferPool();
private static final ByteBufferPool BUFFER_POOL = new WeakReferencedElasticByteBufferPool();

/**
* OutputStream level last exception, will be used to indicate the fatal
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedBlockWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;
import org.apache.hadoop.hdfs.server.datanode.DataNode;
import org.apache.hadoop.io.ByteBufferPool;
import org.apache.hadoop.io.ElasticByteBufferPool;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.io.WeakReferencedElasticByteBufferPool;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.token.Token;

Expand Down Expand Up @@ -69,7 +69,7 @@ class StripedBlockWriter {
private ByteBuffer targetBuffer;
private long blockOffset4Target = 0;
private long seqNo4Target = 0;
private static final ByteBufferPool BUFFER_POOL = new ElasticByteBufferPool();
private static final ByteBufferPool BUFFER_POOL = new WeakReferencedElasticByteBufferPool();

StripedBlockWriter(StripedWriter stripedWriter, DataNode datanode,
Configuration conf, ExtendedBlock block,
Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.apache.hadoop.hdfs.util.StripedBlockUtil;
import org.apache.hadoop.hdfs.util.StripedBlockUtil.BlockReadStats;
import org.apache.hadoop.io.ByteBufferPool;
import org.apache.hadoop.io.ElasticByteBufferPool;
import org.apache.hadoop.io.WeakReferencedElasticByteBufferPool;
import org.apache.hadoop.io.erasurecode.CodecUtil;
import org.apache.hadoop.io.erasurecode.ErasureCoderOptions;
import org.apache.hadoop.io.erasurecode.rawcoder.RawErasureDecoder;
Expand Down Expand Up @@ -108,7 +108,7 @@ abstract class StripedReconstructor {
private final ErasureCoderOptions coderOptions;
private RawErasureDecoder decoder;
private final ExtendedBlock blockGroup;
private static final ByteBufferPool BUFFER_POOL = new ElasticByteBufferPool();
private static final ByteBufferPool BUFFER_POOL = new WeakReferencedElasticByteBufferPool();

private final boolean isValidationEnabled;
private DecodingValidator validator;
Expand Down
3 changes: 2 additions & 1 deletion ...op-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/BlockBlobAppendStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

import org.apache.hadoop.fs.impl.StoreImplementationUtils;
import org.apache.hadoop.classification.VisibleForTesting;
import org.apache.hadoop.io.WeakReferencedElasticByteBufferPool;
import org.apache.hadoop.util.Preconditions;
import org.apache.commons.lang3.StringUtils;

Expand Down Expand Up @@ -239,7 +240,7 @@ void dump() {}
* back to the queue
*/
private final ElasticByteBufferPool poolReadyByteBuffers
= new ElasticByteBufferPool();
= new WeakReferencedElasticByteBufferPool();

/**
* The blob's block list.
Expand Down
Loading