Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-15499. Performance severe drops when running RawErasureCoderBenchmark with NativeRSRawErasureCoder. Contributed by Sammi Chen. 

(cherry picked from commit 18201b882a)
(cherry picked from commit b874110275)
This commit is contained in:
Sammi Chen 2018-06-11 13:53:37 +08:00
parent c0d46a84a6
commit e3c96354a7
7 changed files with 128 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/AbstractNativeRawDecoder.java
View File

@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* Abstract native raw decoder for all native coders to extend with.
@ -34,36 +35,46 @@ abstract class AbstractNativeRawDecoder extends RawErasureDecoder {
public static Logger LOG =
LoggerFactory.getLogger(AbstractNativeRawDecoder.class);
// Protect ISA-L coder data structure in native layer from being accessed and
// updated concurrently by the init, release and decode functions.
protected final ReentrantReadWriteLock decoderLock =
new ReentrantReadWriteLock();
public AbstractNativeRawDecoder(ErasureCoderOptions coderOptions) {
super(coderOptions);
}
@Override
protected synchronized void doDecode(ByteBufferDecodingState decodingState)
protected void doDecode(ByteBufferDecodingState decodingState)
throws IOException {
if (nativeCoder == 0) {
throw new IOException(String.format("%s closed",
getClass().getSimpleName()));
}
int[] inputOffsets = new int[decodingState.inputs.length];
int[] outputOffsets = new int[decodingState.outputs.length];
ByteBuffer buffer;
for (int i = 0; i < decodingState.inputs.length; ++i) {
buffer = decodingState.inputs[i];
if (buffer != null) {
inputOffsets[i] = buffer.position();
decoderLock.readLock().lock();
try {
if (nativeCoder == 0) {
throw new IOException(String.format("%s closed",
getClass().getSimpleName()));
}
}
int[] inputOffsets = new int[decodingState.inputs.length];
int[] outputOffsets = new int[decodingState.outputs.length];
for (int i = 0; i < decodingState.outputs.length; ++i) {
buffer = decodingState.outputs[i];
outputOffsets[i] = buffer.position();
}
ByteBuffer buffer;
for (int i = 0; i < decodingState.inputs.length; ++i) {
buffer = decodingState.inputs[i];
if (buffer != null) {
inputOffsets[i] = buffer.position();
}
}
performDecodeImpl(decodingState.inputs, inputOffsets,
decodingState.decodeLength, decodingState.erasedIndexes,
decodingState.outputs, outputOffsets);
for (int i = 0; i < decodingState.outputs.length; ++i) {
buffer = decodingState.outputs[i];
outputOffsets[i] = buffer.position();
}
performDecodeImpl(decodingState.inputs, inputOffsets,
decodingState.decodeLength, decodingState.erasedIndexes,
decodingState.outputs, outputOffsets);
} finally {
decoderLock.readLock().unlock();
}
}
protected abstract void performDecodeImpl(ByteBuffer[] inputs,

49
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/AbstractNativeRawEncoder.java
View File

@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* Abstract native raw encoder for all native coders to extend with.
@ -34,34 +35,44 @@ abstract class AbstractNativeRawEncoder extends RawErasureEncoder {
public static Logger LOG =
LoggerFactory.getLogger(AbstractNativeRawEncoder.class);
// Protect ISA-L coder data structure in native layer from being accessed and
// updated concurrently by the init, release and encode functions.
protected final ReentrantReadWriteLock encoderLock =
new ReentrantReadWriteLock();
public AbstractNativeRawEncoder(ErasureCoderOptions coderOptions) {
super(coderOptions);
}
@Override
protected synchronized void doEncode(ByteBufferEncodingState encodingState)
protected void doEncode(ByteBufferEncodingState encodingState)
throws IOException {
if (nativeCoder == 0) {
throw new IOException(String.format("%s closed",
getClass().getSimpleName()));
}
int[] inputOffsets = new int[encodingState.inputs.length];
int[] outputOffsets = new int[encodingState.outputs.length];
int dataLen = encodingState.inputs[0].remaining();
encoderLock.readLock().lock();
try {
if (nativeCoder == 0) {
throw new IOException(String.format("%s closed",
getClass().getSimpleName()));
}
int[] inputOffsets = new int[encodingState.inputs.length];
int[] outputOffsets = new int[encodingState.outputs.length];
int dataLen = encodingState.inputs[0].remaining();
ByteBuffer buffer;
for (int i = 0; i < encodingState.inputs.length; ++i) {
buffer = encodingState.inputs[i];
inputOffsets[i] = buffer.position();
}
ByteBuffer buffer;
for (int i = 0; i < encodingState.inputs.length; ++i) {
buffer = encodingState.inputs[i];
inputOffsets[i] = buffer.position();
}
for (int i = 0; i < encodingState.outputs.length; ++i) {
buffer = encodingState.outputs[i];
outputOffsets[i] = buffer.position();
}
for (int i = 0; i < encodingState.outputs.length; ++i) {
buffer = encodingState.outputs[i];
outputOffsets[i] = buffer.position();
}
performEncodeImpl(encodingState.inputs, inputOffsets, dataLen,
encodingState.outputs, outputOffsets);
performEncodeImpl(encodingState.inputs, inputOffsets, dataLen,
encodingState.outputs, outputOffsets);
} finally {
encoderLock.readLock().unlock();
}
}
protected abstract void performEncodeImpl(

19
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/NativeRSRawDecoder.java
View File

@ -36,19 +36,30 @@ public class NativeRSRawDecoder extends AbstractNativeRawDecoder {
public NativeRSRawDecoder(ErasureCoderOptions coderOptions) {
super(coderOptions);
initImpl(coderOptions.getNumDataUnits(), coderOptions.getNumParityUnits());
decoderLock.writeLock().lock();
try {
initImpl(coderOptions.getNumDataUnits(),
coderOptions.getNumParityUnits());
} finally {
decoderLock.writeLock().unlock();
}
}
@Override
protected synchronized void performDecodeImpl(
protected void performDecodeImpl(
ByteBuffer[] inputs, int[] inputOffsets, int dataLen, int[] erased,
ByteBuffer[] outputs, int[] outputOffsets) throws IOException {
decodeImpl(inputs, inputOffsets, dataLen, erased, outputs, outputOffsets);
}
@Override
public synchronized void release() {
destroyImpl();
public void release() {
decoderLock.writeLock().lock();
try {
destroyImpl();
} finally {
decoderLock.writeLock().unlock();
}
}
@Override

19
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/NativeRSRawEncoder.java
View File

@ -36,19 +36,30 @@ public class NativeRSRawEncoder extends AbstractNativeRawEncoder {
public NativeRSRawEncoder(ErasureCoderOptions coderOptions) {
super(coderOptions);
initImpl(coderOptions.getNumDataUnits(), coderOptions.getNumParityUnits());
encoderLock.writeLock().lock();
try {
initImpl(coderOptions.getNumDataUnits(),
coderOptions.getNumParityUnits());
} finally {
encoderLock.writeLock().unlock();
}
}
@Override
protected synchronized void performEncodeImpl(
protected void performEncodeImpl(
ByteBuffer[] inputs, int[] inputOffsets, int dataLen,
ByteBuffer[] outputs, int[] outputOffsets) throws IOException {
encodeImpl(inputs, inputOffsets, dataLen, outputs, outputOffsets);
}
@Override
public synchronized void release() {
destroyImpl();
public void release() {
encoderLock.writeLock().lock();
try {
destroyImpl();
} finally {
encoderLock.writeLock().unlock();
}
}
@Override

19
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/NativeXORRawDecoder.java
View File

@ -36,19 +36,30 @@ public class NativeXORRawDecoder extends AbstractNativeRawDecoder {
public NativeXORRawDecoder(ErasureCoderOptions coderOptions) {
super(coderOptions);
initImpl(coderOptions.getNumDataUnits(), coderOptions.getNumParityUnits());
decoderLock.writeLock().lock();
try {
initImpl(coderOptions.getNumDataUnits(),
coderOptions.getNumParityUnits());
} finally {
decoderLock.writeLock().unlock();
}
}
@Override
protected synchronized void performDecodeImpl(
protected void performDecodeImpl(
ByteBuffer[] inputs, int[] inputOffsets, int dataLen, int[] erased,
ByteBuffer[] outputs, int[] outputOffsets) throws IOException {
decodeImpl(inputs, inputOffsets, dataLen, erased, outputs, outputOffsets);
}
@Override
public synchronized void release() {
destroyImpl();
public void release() {
decoderLock.writeLock().lock();
try {
destroyImpl();
} finally {
decoderLock.writeLock().unlock();
}
}
private native void initImpl(int numDataUnits, int numParityUnits);

19
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/NativeXORRawEncoder.java
View File

@ -36,19 +36,30 @@ public class NativeXORRawEncoder extends AbstractNativeRawEncoder {
public NativeXORRawEncoder(ErasureCoderOptions coderOptions) {
super(coderOptions);
initImpl(coderOptions.getNumDataUnits(), coderOptions.getNumParityUnits());
encoderLock.writeLock().lock();
try {
initImpl(coderOptions.getNumDataUnits(),
coderOptions.getNumParityUnits());
} finally {
encoderLock.writeLock().unlock();
}
}
@Override
protected synchronized void performEncodeImpl(
protected void performEncodeImpl(
ByteBuffer[] inputs, int[] inputOffsets, int dataLen,
ByteBuffer[] outputs, int[] outputOffsets) throws IOException {
encodeImpl(inputs, inputOffsets, dataLen, outputs, outputOffsets);
}
@Override
public synchronized void release() {
destroyImpl();
public void release() {
encoderLock.writeLock().lock();
try {
destroyImpl();
} finally {
encoderLock.writeLock().unlock();
}
}
private native void initImpl(int numDataUnits, int numParityUnits);

6
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/rawcoder/RawErasureCoderBenchmark.java
View File

@ -230,6 +230,12 @@ public final class RawErasureCoderBenchmark {
throw e;
} finally {
executor.shutdown();
if (encoder != null) {
encoder.release();
}
if (decoder != null) {
decoder.release();
}
}
}