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 te...@apache.org on 2017/08/12 03:55:37 UTC
hadoop git commit: Revert "YARN-6882.
AllocationFileLoaderService.reloadAllocations() should use the diamond
operator"
Repository: hadoop
Updated Branches:
refs/heads/branch-2 ce0cdc50d -> 7d3cea232
Revert "YARN-6882. AllocationFileLoaderService.reloadAllocations() should use the diamond operator"
This reverts commit ce0cdc50d9700118139e7907dede274d2db93fda.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7d3cea23
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7d3cea23
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7d3cea23
Branch: refs/heads/branch-2
Commit: 7d3cea232db4ce8249e9b078f1bfea00e0e4cadc
Parents: ce0cdc5
Author: Daniel Templeton <te...@apache.org>
Authored: Fri Aug 11 20:52:07 2017 -0700
Committer: Daniel Templeton <te...@apache.org>
Committed: Fri Aug 11 20:52:07 2017 -0700
----------------------------------------------------------------------
.../scheduler/fair/AllocationFileLoaderService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d3cea23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java
index 5696a97..a142d37 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/AllocationFileLoaderService.java
@@ -267,7 +267,7 @@ public class AllocationFileLoaderService extends AbstractService {
Map<FSQueueType, Set<String>> configuredQueues = new HashMap<>();
for (FSQueueType queueType : FSQueueType.values()) {
- configuredQueues.put(queueType, new HashSet<>());
+ configuredQueues.put(queueType, new HashSet<String>());
}
// Read and parse the allocations file.
@@ -281,7 +281,7 @@ public class AllocationFileLoaderService extends AbstractService {
throw new AllocationConfigurationException("Bad fair scheduler config " +
"file: top-level element not <allocations>");
NodeList elements = root.getChildNodes();
- List<Element> queueElements = new ArrayList<>();
+ List<Element> queueElements = new ArrayList<Element>();
Element placementPolicyElement = null;
for (int i = 0; i < elements.getLength(); i++) {
Node node = elements.item(i);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org