diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
index 0a69c99cab8..26df995e552 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
@@ -23,9 +23,9 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -227,8 +227,7 @@ void loadINodeDirectorySectionInParallel(ExecutorService service,
       LOG.info("Loading the INodeDirectory section in parallel with {} sub-" +
               "sections", sections.size());
       CountDownLatch latch = new CountDownLatch(sections.size());
-      final CopyOnWriteArrayList<IOException> exceptions =
-          new CopyOnWriteArrayList<>();
+      final List<IOException> exceptions = Collections.synchronizedList(new ArrayList<>());
       for (FileSummary.Section s : sections) {
         service.submit(() -> {
           InputStream ins = null;
@@ -237,8 +236,7 @@ void loadINodeDirectorySectionInParallel(ExecutorService service,
                 compressionCodec);
             loadINodeDirectorySection(ins);
           } catch (Exception e) {
-            LOG.error("An exception occurred loading INodeDirectories in " +
-                "parallel", e);
+            LOG.error("An exception occurred loading INodeDirectories in parallel", e);
             exceptions.add(new IOException(e));
           } finally {
             latch.countDown();
@@ -424,8 +422,7 @@ void loadINodeSectionInParallel(ExecutorService service,
       long expectedInodes = 0;
       CountDownLatch latch = new CountDownLatch(sections.size());
       AtomicInteger totalLoaded = new AtomicInteger(0);
-      final CopyOnWriteArrayList<IOException> exceptions =
-          new CopyOnWriteArrayList<>();
+      final List<IOException> exceptions = Collections.synchronizedList(new ArrayList<>());
 
       for (int i=0; i < sections.size(); i++) {
         FileSummary.Section s = sections.get(i);