Author: bobby
Date: Wed Feb 29 15:21:20 2012
New Revision: 1295149
URL: http://svn.apache.org/viewvc?rev=1295149&view=rev
Log:
svn merge -c 1295147 trunk to branch 23 FIXES MAPREDUCE-3687. If AM dies
before it returns new tracking URL, proxy redirects to http://N/A/ and doesn't
return error code (Ravi Prakash via bobby)
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1295149&r1=1295148&r2=1295149&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed
Feb 29 15:21:20 2012
@@ -134,6 +134,10 @@ Release 0.23.2 - UNRELEASED
so that race conditions don't fail tasks by inadvertantly changing the
timestamps. (Siddarth Seth via vinodkv)
+ MAPREDUCE-3687. If AM dies before it returns new tracking URL, proxy
+ redirects to http://N/A/ and doesn't return error code (Ravi Prakash via
+ bobby)
+
Release 0.23.1 - 2012-02-17
NEW FEATURES
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java?rev=1295149&r1=1295148&r2=1295149&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServlet.java
Wed Feb 29 15:21:20 2012
@@ -237,7 +237,11 @@ public class WebAppProxyServlet extends
}
URI trackingUri = ProxyUriUtils.getUriFromAMUrl(
applicationReport.getOriginalTrackingUrl());
-
+ if(applicationReport.getOriginalTrackingUrl().equals("N/A")) {
+ notFound(resp, "The MRAppMaster died before writing anything.");
+ return;
+ }
+
String runningUser = applicationReport.getUser();
if(checkUser && !runningUser.equals(remoteUser)) {
LOG.info("Asking "+remoteUser+" if they want to connect to the " +
