Skip to content

HADOOP-18505. Handled ArrayIndexOutOfBoundsException in TestCoderBase #5065

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

Closed
teamconfx wants to merge 3 commits into from
Closed

HADOOP-18505. Handled ArrayIndexOutOfBoundsException in TestCoderBase #5065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
138553b
Handled ArrayIndexOutOfBoundsException in TestCoderBase
teamconfx Oct 22, 2022
5f78dfd
Reverted HadoopIllegalArgumentException to IllegalArgumentException
teamconfx Oct 23, 2022
dce9e4d
Removed the unused HadoopIllegalArgumentException import
teamconfx Oct 23, 2022
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
20 changes: 16 additions & 4 deletions ...n-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/TestCoderBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,25 @@ protected ECChunk[] backupAndEraseChunks(ECChunk[] dataChunks,
int idx = 0;

for (int i = 0; i < erasedDataIndexes.length; i++) {
toEraseChunks[idx ++] = dataChunks[erasedDataIndexes[i]];
dataChunks[erasedDataIndexes[i]] = null;
if (erasedDataIndexes[i] < dataChunks.length) {
toEraseChunks[idx ++] = dataChunks[erasedDataIndexes[i]];
dataChunks[erasedDataIndexes[i]] = null;
} else {
throw new IllegalArgumentException(
"The erased index is out of bound: erasedDataIndex="
+ erasedDataIndexes[i]);
}
}

for (int i = 0; i < erasedParityIndexes.length; i++) {
toEraseChunks[idx ++] = parityChunks[erasedParityIndexes[i]];
parityChunks[erasedParityIndexes[i]] = null;
if (erasedParityIndexes[i] < parityChunks.length) {
toEraseChunks[idx ++] = parityChunks[erasedParityIndexes[i]];
parityChunks[erasedParityIndexes[i]] = null;
} else {
throw new IllegalArgumentException(
"The erased index is out of bound: erasedParityIndex="
+ erasedParityIndexes[i]);
}
}

return toEraseChunks;
Expand Down
15 changes: 13 additions & 2 deletions ...common/src/test/java/org/apache/hadoop/io/erasurecode/rawcoder/TestDecodingValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public static Collection<Object[]> data() {
{RSRawErasureCoderFactory.class, 6, 3, new int[]{1}, new int[]{}},
{RSRawErasureCoderFactory.class, 6, 3, new int[]{3}, new int[]{0}},
{RSRawErasureCoderFactory.class, 6, 3, new int[]{2, 4}, new int[]{1}},
{RSRawErasureCoderFactory.class, 6, 1, new int[]{0}, new int[]{1}},
{NativeRSRawErasureCoderFactory.class, 6, 3, new int[]{0}, new int[]{}},
{XORRawErasureCoderFactory.class, 10, 1, new int[]{0}, new int[]{}},
{NativeXORRawErasureCoderFactory.class, 10, 1, new int[]{0},
Expand Down Expand Up @@ -123,7 +124,12 @@ protected void performTestValidate(int chunkSize) {
}

// decode
backupAndEraseChunks(clonedDataChunks, parityChunks);
try {
Copy link
Contributor

@steveloughran steveloughran Oct 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use LambdaTestUtils.intercept() for all bits of test code which validates expected exceptions

Copy link
Contributor Author

@teamconfx teamconfx Oct 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The backupAndEraseChunks method would only throw exception if the erased data index is out of bound. This is only true for the newly added value set.

Adding LambdaTestUtils.intercept() fails the tests for other parameterized values since LambdaTestUtils.intercept() @throws AssertionError if the evaluation call didn't raise an exception.

backupAndEraseChunks(clonedDataChunks, parityChunks);
} catch (IllegalArgumentException e) {
String expected = "The erased index is out of bound";
Assume.assumeTrue(expected, !e.toString().contains(expected));
}
ECChunk[] inputChunks =
prepareInputChunksForDecoding(clonedDataChunks, parityChunks);
markChunks(inputChunks);
Expand Down Expand Up @@ -210,7 +216,12 @@ public void testValidateWithBadDecoding() throws IOException {
}

// decode
backupAndEraseChunks(clonedDataChunks, parityChunks);
try {
backupAndEraseChunks(clonedDataChunks, parityChunks);
} catch (IllegalArgumentException e) {
String expected = "The erased index is out of bound";
Assume.assumeTrue(expected, !e.toString().contains(expected));
}
ECChunk[] inputChunks =
prepareInputChunksForDecoding(clonedDataChunks, parityChunks);
markChunks(inputChunks);
Expand Down