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 ka...@apache.org on 2015/04/27 22:39:54 UTC
[2/3] hadoop git commit: YARN-3516. killing ContainerLocalizer action
doesn't take effect when private localizer receives FETCH_FAILURE status.
Contributed by zhihai xu
YARN-3516. killing ContainerLocalizer action doesn't take effect when
private localizer receives FETCH_FAILURE status. Contributed by zhihai
xu
(cherry picked from commit 0b3f8957a87ada1a275c9904b211fdbdcefafb02)
(cherry picked from commit 8f6053ae517d30dedece4f0577341ec3c2482252)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bec78f9b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bec78f9b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bec78f9b
Branch: refs/heads/branch-2.7
Commit: bec78f9b85381bf05a2b3b1391ebeaaf4caa7ba9
Parents: b5cc78e
Author: Xuan <xg...@apache.org>
Authored: Thu Apr 23 16:40:40 2015 -0700
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Mon Apr 27 13:35:38 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 4 ++++
.../containermanager/localizer/ResourceLocalizationService.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bec78f9b/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 914b1bc..5760f34 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -38,6 +38,10 @@ Release 2.7.1 - UNRELEASED
YARN-3465. Use LinkedHashMap to preserve order of resource requests.
(Zhihai Xu via kasha)
+ YARN-3516. killing ContainerLocalizer action doesn't take effect when
+ private localizer receives FETCH_FAILURE status.(zhihai xu via xgong)
+
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bec78f9b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.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/localizer/ResourceLocalizationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
index dd50ead..bb05946 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
@@ -981,7 +981,7 @@ public class ResourceLocalizationService extends CompositeService
case FETCH_FAILURE:
final String diagnostics = stat.getException().toString();
LOG.warn(req + " failed: " + diagnostics);
- response.setLocalizerAction(LocalizerAction.DIE);
+ action = LocalizerAction.DIE;
getLocalResourcesTracker(req.getVisibility(), user, applicationId)
.handle(new ResourceFailedLocalizationEvent(
req, diagnostics));