YARN-2246. Made the proxy tracking URL always be http(s)://proxy addr:port/proxy/<appId> to avoid duplicate sections. Contributed by Devaraj K.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d5855c0e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d5855c0e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d5855c0e Branch: refs/heads/YARN-2928 Commit: d5855c0e46404cfc1b5a63e59015e68ba668f0ea Parents: e9d26fe Author: Zhijie Shen <zjs...@apache.org> Authored: Tue Feb 10 15:24:01 2015 -0800 Committer: Zhijie Shen <zjs...@apache.org> Committed: Tue Feb 10 15:24:01 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 4 ++++ .../rmapp/attempt/RMAppAttemptImpl.java | 18 ++++++------------ .../attempt/TestRMAppAttemptTransitions.java | 9 ++------- 3 files changed, 12 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5855c0e/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index ee58b24..92e1803 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -533,6 +533,10 @@ Release 2.7.0 - UNRELEASED YARN-2809. Implement workaround for linux kernel panic when removing cgroup (Nathan Roberts via jlowe) + YARN-2246. Made the proxy tracking URL always be + http(s)://proxy addr:port/proxy/<appId> to avoid duplicate sections. (Devaraj + K via zjshen) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5855c0e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.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/rmapp/attempt/RMAppAttemptImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java index 4c52d29..e1218ad 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java @@ -441,7 +441,7 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable { this.readLock = lock.readLock(); this.writeLock = lock.writeLock(); - this.proxiedTrackingUrl = generateProxyUriWithScheme(null); + this.proxiedTrackingUrl = generateProxyUriWithScheme(); this.maybeLastAttempt = maybeLastAttempt; this.stateMachine = stateMachineFactory.make(this); @@ -534,21 +534,19 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable { } } - private String generateProxyUriWithScheme( - final String trackingUriWithoutScheme) { + private String generateProxyUriWithScheme() { this.readLock.lock(); try { final String scheme = WebAppUtils.getHttpSchemePrefix(conf); - URI trackingUri = StringUtils.isEmpty(trackingUriWithoutScheme) ? null : - ProxyUriUtils.getUriFromAMUrl(scheme, trackingUriWithoutScheme); String proxy = WebAppUtils.getProxyHostAndPort(conf); URI proxyUri = ProxyUriUtils.getUriFromAMUrl(scheme, proxy); - URI result = ProxyUriUtils.getProxyUri(trackingUri, proxyUri, + URI result = ProxyUriUtils.getProxyUri(null, proxyUri, applicationAttemptId.getApplicationId()); return result.toASCIIString(); } catch (URISyntaxException e) { - LOG.warn("Could not proxify "+trackingUriWithoutScheme,e); - return trackingUriWithoutScheme; + LOG.warn("Could not proxify the uri for " + + applicationAttemptId.getApplicationId(), e); + return null; } finally { this.readLock.unlock(); } @@ -811,7 +809,6 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable { recoverAppAttemptCredentials(credentials, attemptState.getState()); this.recoveredFinalState = attemptState.getState(); this.originalTrackingUrl = attemptState.getFinalTrackingUrl(); - this.proxiedTrackingUrl = generateProxyUriWithScheme(originalTrackingUrl); this.finalStatus = attemptState.getFinalApplicationStatus(); this.startTime = attemptState.getStartTime(); this.finishTime = attemptState.getFinishTime(); @@ -1365,8 +1362,6 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable { appAttempt.rpcPort = registrationEvent.getRpcport(); appAttempt.originalTrackingUrl = sanitizeTrackingUrl(registrationEvent.getTrackingurl()); - appAttempt.proxiedTrackingUrl = - appAttempt.generateProxyUriWithScheme(appAttempt.originalTrackingUrl); // Let the app know appAttempt.eventHandler.handle(new RMAppEvent(appAttempt @@ -1584,7 +1579,6 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable { (RMAppAttemptUnregistrationEvent) event; diagnostics.append(unregisterEvent.getDiagnostics()); originalTrackingUrl = sanitizeTrackingUrl(unregisterEvent.getFinalTrackingUrl()); - proxiedTrackingUrl = generateProxyUriWithScheme(originalTrackingUrl); finalStatus = unregisterEvent.getFinalApplicationStatus(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/d5855c0e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java index fc653dc..fee40e7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java @@ -44,7 +44,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -345,14 +344,10 @@ public class TestRMAppAttemptTransitions { String url = null; final String scheme = WebAppUtils.getHttpSchemePrefix(conf); try { - URI trackingUri = - StringUtils.isEmpty(appAttempt.getOriginalTrackingUrl()) ? null : - ProxyUriUtils - .getUriFromAMUrl(scheme, appAttempt.getOriginalTrackingUrl()); String proxy = WebAppUtils.getProxyHostAndPort(conf); URI proxyUri = ProxyUriUtils.getUriFromAMUrl(scheme, proxy); - URI result = ProxyUriUtils.getProxyUri(trackingUri, proxyUri, - appAttempt.getAppAttemptId().getApplicationId()); + URI result = ProxyUriUtils.getProxyUri(null, proxyUri, appAttempt + .getAppAttemptId().getApplicationId()); url = result.toASCIIString(); } catch (URISyntaxException ex) { Assert.fail();
