Handled ArrayIndexOutOfBoundsException in TestCoderBase

Author: teamconfx

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/rawcoder/DecodingState.java

@@ -39,7 +39,7 @@ <T> void checkParameters(T[] inputs, int[] erasedIndexes,
                            T[] outputs) {
     if (inputs.length != decoder.getNumParityUnits() +
         decoder.getNumDataUnits()) {
-      throw new IllegalArgumentException("Invalid inputs length");
+      throw new HadoopIllegalArgumentException("Invalid inputs length");
     }
 
     if (erasedIndexes.length != outputs.length) {

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/TestCoderBase.java

@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.io.erasurecode;
 
+import org.apache.hadoop.HadoopIllegalArgumentException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.erasurecode.BufferAllocator.SimpleBufferAllocator;
 import org.apache.hadoop.io.erasurecode.BufferAllocator.SlicedBufferAllocator;
@@ -224,13 +225,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 HadoopIllegalArgumentException(
+            "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 HadoopIllegalArgumentException(
+            "The erased index is out of bound: erasedParityIndex="
+                + erasedParityIndexes[i]);
+      }
     }
 
     return toEraseChunks;

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/rawcoder/TestDecodingValidator.java

@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.io.erasurecode.rawcoder;
 
+import org.apache.hadoop.HadoopIllegalArgumentException;
 import org.apache.hadoop.io.erasurecode.ECChunk;
 import org.apache.hadoop.io.erasurecode.ErasureCodeNative;
 import org.apache.hadoop.test.GenericTestUtils;
@@ -50,6 +51,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},
@@ -123,7 +125,12 @@ protected void performTestValidate(int chunkSize) {
     }
 
     // decode
-    backupAndEraseChunks(clonedDataChunks, parityChunks);
+    try {
+      backupAndEraseChunks(clonedDataChunks, parityChunks);
+    } catch (HadoopIllegalArgumentException e) {
+      String expected = "The erased index is out of bound";
+      Assume.assumeTrue(expected, !e.toString().contains(expected));
+    }
     ECChunk[] inputChunks =
         prepareInputChunksForDecoding(clonedDataChunks, parityChunks);
     markChunks(inputChunks);
@@ -210,7 +217,12 @@ public void testValidateWithBadDecoding() throws IOException {
     }
 
     // decode
-    backupAndEraseChunks(clonedDataChunks, parityChunks);
+    try {
+      backupAndEraseChunks(clonedDataChunks, parityChunks);
+    } catch (HadoopIllegalArgumentException e) {
+      String expected = "The erased index is out of bound";
+      Assume.assumeTrue(expected, !e.toString().contains(expected));
+    }
     ECChunk[] inputChunks =
         prepareInputChunksForDecoding(clonedDataChunks, parityChunks);
     markChunks(inputChunks);