You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by eb...@apache.org on 2021/01/15 19:59:46 UTC
[hadoop] branch branch-2.10 updated: YARN-10562. Follow up changes
for YARN-9833. Contributed by Jim Brennan.
This is an automated email from the ASF dual-hosted git repository.
ebadger pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new ea3c3d9 YARN-10562. Follow up changes for YARN-9833. Contributed by Jim Brennan.
ea3c3d9 is described below
commit ea3c3d9022e6506f4a08a47f5447cbeebfffb21a
Author: Eric Badger <eb...@verizonmedia.com>
AuthorDate: Fri Jan 15 19:53:02 2021 +0000
YARN-10562. Follow up changes for YARN-9833. Contributed by Jim Brennan.
(cherry picked from commit 768e2f42ba3f82802e2ebf39d44fe6c30037583c)
---
.../hadoop/yarn/server/nodemanager/DirectoryCollection.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DirectoryCollection.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DirectoryCollection.java
index ec7e6b1..5f6e4f3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DirectoryCollection.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DirectoryCollection.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -29,7 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
@@ -242,9 +242,9 @@ public class DirectoryCollection {
throw new YarnRuntimeException(e);
}
- localDirs = new CopyOnWriteArrayList<>(dirs);
- errorDirs = new CopyOnWriteArrayList<>();
- fullDirs = new CopyOnWriteArrayList<>();
+ localDirs = new ArrayList<>(Arrays.asList(dirs));
+ errorDirs = new ArrayList<>();
+ fullDirs = new ArrayList<>();
directoryErrorInfo = new ConcurrentHashMap<>();
ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@@ -290,7 +290,7 @@ public class DirectoryCollection {
List<String> getFailedDirs() {
this.readLock.lock();
try {
- return ImmutableList.copyOf(
+ return Collections.unmodifiableList(
DirectoryCollection.concat(errorDirs, fullDirs));
} finally {
this.readLock.unlock();
@@ -318,7 +318,7 @@ public class DirectoryCollection {
List<String> getErroredDirs() {
this.readLock.lock();
try {
- return Collections.unmodifiableList(errorDirs);
+ return ImmutableList.copyOf(errorDirs);
} finally {
this.readLock.unlock();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org