HADOOP-17745. Wrap IOException with InterruptedException cause properly

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java

@@ -482,6 +482,11 @@ public static IOException wrapException(final String path,
     if (exception instanceof InterruptedIOException
         || exception instanceof PathIOException) {
       return exception;
+    } else if (exception.getCause() instanceof InterruptedException) {
+      InterruptedIOException interruptedIOException =
+              new InterruptedIOException(exception.getMessage());
+      interruptedIOException.initCause(exception.getCause());
+      return interruptedIOException;
     } else {
       String msg = String
           .format("Failed with %s while processing file/directory :[%s] in "

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

@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.io;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+import org.apache.hadoop.test.AbstractHadoopTestBase;
+
+import static junit.framework.TestCase.assertEquals;
+
+public class TestIOUtilsWrapExceptionSuite extends AbstractHadoopTestBase {
+    @Test
+    public void testWrapExceptionWithInterruptedException() throws Exception {
+        InterruptedIOException inputException = new InterruptedIOException("message");
+        NullPointerException causeException = new NullPointerException("cause");
+        inputException.initCause(causeException);
+        Exception outputException = IOUtils.wrapException("path", "methodName", inputException);
+
+        // The new exception should retain the input message, cause, and type
+        Assertions.assertThat(outputException).isInstanceOf(InterruptedIOException.class);
+        Assertions.assertThat(outputException.getCause()).isInstanceOf(NullPointerException.class)
+                .describedAs("inner cause");
+        assertEquals(outputException.getMessage(), inputException.getMessage());
+        assertEquals(outputException.getCause(), inputException.getCause());
+    }
+
+    @Test
+    public void testWrapExceptionWithInterruptedCauseException() throws Exception {
+        IOException inputException = new IOException("message");
+        InterruptedException causeException = new InterruptedException("cause");
+        inputException.initCause(causeException);
+        Exception outputException = IOUtils.wrapException("path", "methodName", inputException);
+
+        // The new exception should retain the input message and cause
+        // but be an InterruptedIOException because the cause was an InterruptedException
+        Assertions.assertThat(outputException).isInstanceOf(InterruptedIOException.class);
+        Assertions.assertThat(outputException.getCause()).isInstanceOf(InterruptedException.class);
+        assertEquals("getMessage()",
+                outputException.getMessage(), inputException.getMessage());
+        assertEquals("getCause()",
+                outputException.getCause(), inputException.getCause());
+    }
+}