[1/3] hadoop git commit: YARN-3465. Use LinkedHashMap to preserve order of resource requests. (Zhihai Xu via kasha)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 176d22b44 - 4ddcc7e5b
YARN-3465. Use LinkedHashMap to preserve order of resource requests. (Zhihai Xu
via kasha)
(cherry picked from commit 6495940eae09418a939882a8955845f9241a6485)
(cherry picked from commit 53e0bf5c172c396780b96fda8dd31ad799a25fed)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b5cc78e5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b5cc78e5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b5cc78e5
Branch: refs/heads/branch-2.7
Commit: b5cc78e57e5ae3a3194e72132ded1c5261ea5f60
Parents: 176d22b
Author: Karthik Kambatla ka...@apache.org
Authored: Thu Apr 9 00:07:49 2015 -0700
Committer: Karthik Kambatla ka...@apache.org
Committed: Mon Apr 27 12:39:21 2015 -0700
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../nodemanager/containermanager/container/ContainerImpl.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b5cc78e5/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d9d8f5f..914b1bc 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -35,6 +35,9 @@ Release 2.7.1 - UNRELEASED
YARN-3472. Fixed possible leak in DelegationTokenRenewer#allTokens.
(Rohith Sharmaks via jianhe)
+YARN-3465. Use LinkedHashMap to preserve order of resource requests.
+(Zhihai Xu via kasha)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b5cc78e5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
index cf3d8e7..131d439 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -638,7 +639,7 @@ public class ContainerImpl implements Container {
return ContainerState.LOCALIZATION_FAILED;
}
MapLocalResourceVisibility, CollectionLocalResourceRequest req =
-new HashMapLocalResourceVisibility,
+new LinkedHashMapLocalResourceVisibility,
CollectionLocalResourceRequest();
if (!container.publicRsrcs.isEmpty()) {
req.put(LocalResourceVisibility.PUBLIC, container.publicRsrcs);
hadoop git commit: YARN-3465. Use LinkedHashMap to preserve order of resource requests. (Zhihai Xu via kasha)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 4e099c113 - 53e0bf5c1
YARN-3465. Use LinkedHashMap to preserve order of resource requests. (Zhihai Xu
via kasha)
(cherry picked from commit 6495940eae09418a939882a8955845f9241a6485)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/53e0bf5c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/53e0bf5c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/53e0bf5c
Branch: refs/heads/branch-2
Commit: 53e0bf5c172c396780b96fda8dd31ad799a25fed
Parents: 4e099c1
Author: Karthik Kambatla ka...@apache.org
Authored: Thu Apr 9 00:07:49 2015 -0700
Committer: Karthik Kambatla ka...@apache.org
Committed: Thu Apr 9 00:10:23 2015 -0700
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../nodemanager/containermanager/container/ContainerImpl.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/53e0bf5c/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 09fd819..7674f5d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -114,6 +114,9 @@ Release 2.8.0 - UNRELEASED
YARN-2890. MiniYarnCluster should turn on timeline service if
configured to do so. (Mit Desai via hitesh)
+YARN-3465. Use LinkedHashMap to preserve order of resource requests.
+(Zhihai Xu via kasha)
+
Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/53e0bf5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
index cf3d8e7..131d439 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -638,7 +639,7 @@ public class ContainerImpl implements Container {
return ContainerState.LOCALIZATION_FAILED;
}
MapLocalResourceVisibility, CollectionLocalResourceRequest req =
-new HashMapLocalResourceVisibility,
+new LinkedHashMapLocalResourceVisibility,
CollectionLocalResourceRequest();
if (!container.publicRsrcs.isEmpty()) {
req.put(LocalResourceVisibility.PUBLIC, container.publicRsrcs);
hadoop git commit: YARN-3465. Use LinkedHashMap to preserve order of resource requests. (Zhihai Xu via kasha)
Repository: hadoop
Updated Branches:
refs/heads/trunk 9d8952f97 - 6495940ea
YARN-3465. Use LinkedHashMap to preserve order of resource requests. (Zhihai Xu
via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6495940e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6495940e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6495940e
Branch: refs/heads/trunk
Commit: 6495940eae09418a939882a8955845f9241a6485
Parents: 9d8952f
Author: Karthik Kambatla ka...@apache.org
Authored: Thu Apr 9 00:07:49 2015 -0700
Committer: Karthik Kambatla ka...@apache.org
Committed: Thu Apr 9 00:07:49 2015 -0700
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../nodemanager/containermanager/container/ContainerImpl.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6495940e/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 4714f4e..914bba0 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -162,6 +162,9 @@ Release 2.8.0 - UNRELEASED
YARN-2890. MiniYarnCluster should turn on timeline service if
configured to do so. (Mit Desai via hitesh)
+YARN-3465. Use LinkedHashMap to preserve order of resource requests.
+(Zhihai Xu via kasha)
+
Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6495940e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
index cf3d8e7..131d439 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -638,7 +639,7 @@ public class ContainerImpl implements Container {
return ContainerState.LOCALIZATION_FAILED;
}
MapLocalResourceVisibility, CollectionLocalResourceRequest req =
-new HashMapLocalResourceVisibility,
+new LinkedHashMapLocalResourceVisibility,
CollectionLocalResourceRequest();
if (!container.publicRsrcs.isEmpty()) {
req.put(LocalResourceVisibility.PUBLIC, container.publicRsrcs);
