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 va...@apache.org on 2016/01/21 21:15:45 UTC
hadoop git commit: YARN-4622. TestDistributedShell fails for v2 test
cases after modifications for 1.5. (Naganarasimha G R via Varun Saxena)
Repository: hadoop
Updated Branches:
refs/heads/YARN-2928 cab8a1d1e -> 57f12f87a
YARN-4622. TestDistributedShell fails for v2 test cases after modifications for 1.5. (Naganarasimha G R via Varun Saxena)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/57f12f87
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/57f12f87
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/57f12f87
Branch: refs/heads/YARN-2928
Commit: 57f12f87a6b9db9ddff06d0bdb9d48a1c2813b17
Parents: cab8a1d
Author: Varun Saxena <va...@apache.org>
Authored: Fri Jan 22 01:41:25 2016 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Fri Jan 22 01:41:25 2016 +0530
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../hadoop/yarn/client/api/impl/TimelineClientImpl.java | 8 +++++---
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/57f12f87/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 1a0ed56..25c424a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -214,6 +214,9 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1
YARN-3995. Some of the NM events are not getting published due race
condition when AM container finishes in NM (Naganarasimha G R via sjlee)
+ YARN-4622. TestDistributedShell fails for v2 test cases after modifications for 1.5.
+ (Naganarasimha G R via varunsaxena)
+
Trunk - Unreleased
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/57f12f87/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
index 8b68784..3e63242 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java
@@ -69,6 +69,7 @@ import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier;
import org.apache.hadoop.yarn.webapp.YarnJacksonJaxbJsonProvider;
import org.codehaus.jackson.map.ObjectMapper;
+
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
@@ -331,9 +332,10 @@ public class TimelineClientImpl extends TimelineClient {
@Override
protected void serviceStart() throws Exception {
- timelineWriter = createTimelineWriter(
- configuration, authUgi, client,
- constructResURI(getConfig(), timelineServiceAddress, false));
+ if (!timelineServiceV2) {
+ timelineWriter = createTimelineWriter(configuration, authUgi, client,
+ constructResURI(getConfig(), timelineServiceAddress, false));
+ }
}
protected TimelineWriter createTimelineWriter(Configuration conf,