knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject git commit: KNOX-413: Yarn responses with TrackingUrl in the body not getting blanked out
Date Wed, 03 Sep 2014 13:45:12 GMT
Repository: knox
Updated Branches:
  refs/heads/master f0af8bd6c -> 21ad01621


KNOX-413: Yarn responses with TrackingUrl in the body not getting blanked out


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/21ad0162
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/21ad0162
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/21ad0162

Branch: refs/heads/master
Commit: 21ad01621a2ea0913e07130c02b55ebd4c22ddba
Parents: f0af8bd
Author: Kevin Minder <kevin.minder@hortonworks.com>
Authored: Wed Sep 3 09:45:04 2014 -0400
Committer: Kevin Minder <kevin.minder@hortonworks.com>
Committed: Wed Sep 3 09:45:04 2014 -0400

----------------------------------------------------------------------
 .../yarn/rm/ResourceManagerDeploymentContributor/rewrite.xml | 8 ++++----
 .../java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java | 1 +
 .../hadoop/gateway/GatewayBasicFuncTest/yarn/apps.json       | 5 +++--
 .../apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.xml | 5 +++--
 4 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/21ad0162/gateway-service-yarn-rm/src/main/resources/org/apache/hadoop/gateway/yarn/rm/ResourceManagerDeploymentContributor/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-yarn-rm/src/main/resources/org/apache/hadoop/gateway/yarn/rm/ResourceManagerDeploymentContributor/rewrite.xml
b/gateway-service-yarn-rm/src/main/resources/org/apache/hadoop/gateway/yarn/rm/ResourceManagerDeploymentContributor/rewrite.xml
index b82f106..3081de0 100644
--- a/gateway-service-yarn-rm/src/main/resources/org/apache/hadoop/gateway/yarn/rm/ResourceManagerDeploymentContributor/rewrite.xml
+++ b/gateway-service-yarn-rm/src/main/resources/org/apache/hadoop/gateway/yarn/rm/ResourceManagerDeploymentContributor/rewrite.xml
@@ -70,7 +70,7 @@
         <content type="*/json">
         	<buffer path="$.apps.app[*]">
         		<detect path="$.trackingUI" value="History">
-					<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlHistory/outbound"/>
+					<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
 				</detect>
 				<detect path="$.trackingUI" value="ApplicationMaster">
 					<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
@@ -82,7 +82,7 @@
         <content type="*/xml">
         	<buffer path="/apps/app">
         		<detect path="trackingUI" value="History">
-					<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlHistory/outbound"/>
+					<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
 				</detect>
 				<detect path="trackingUI" value="ApplicationMaster">
 					<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
@@ -97,7 +97,7 @@
         <content type="*/json">
         	<buffer path="$.app">
 	       		<detect path="$.trackingUI" value="History">
-	       			<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlHistory/outbound"/>
+	       			<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
 	       		</detect>
 	       		<detect path="$.trackingUI" value="ApplicationMaster">
 	       			<apply path="$.trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>
@@ -109,7 +109,7 @@
         <content type="*/xml">
         	<buffer path="/app">
 	       		<detect path="trackingUI" value="History">
-	       			<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlHistory/outbound"/>
+	       			<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/url/outbound"/>
 	       		</detect>
 	       		<detect path="trackingUI" value="ApplicationMaster">
 	       			<apply path="trackingUrl" rule="RESOURCEMANAGER/resourcemanager/trackingUrlAM/outbound"/>

http://git-wip-us.apache.org/repos/asf/knox/blob/21ad0162/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
index 4ab1dfd..63b174c 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
@@ -2107,6 +2107,7 @@ public class GatewayBasicFuncTest {
         .contentType( contentType )
         .content( "apps.app[0].trackingUrl", isEmptyString() )
         .content( "apps.app[1].trackingUrl", startsWith( "http://" + gatewayAddress.getHostName()
+ ":" + gatewayAddress.getPort() + "/" ) )
+        .content( "apps.app[2].trackingUrl", isEmptyString() )
         .content( "apps.app[0].amContainerLogs", isEmptyString() )
         .content( "apps.app[1].amContainerLogs", isEmptyString() )
         .content( "apps.app[0].amHostHttpAddress", isEmptyString() )

http://git-wip-us.apache.org/repos/asf/knox/blob/21ad0162/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.json
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.json
b/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.json
index e6bd1f8..dc95157 100644
--- a/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.json
+++ b/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.json
@@ -55,8 +55,9 @@
 				"state":"FAILED",
 				"finalStatus":"FAILED",
 				"progress":0.0,
-				"trackingUI":"UNASSIGNED",
-				"diagnostics":"Application application_1399541193872_0009 submitted by user hdfs to unknown
queue: a1",
+				"trackingUI":"History",
+        "trackingUrl":"http://localhost:8088/cluster/app/application_1409008107556_0001",
+        "diagnostics":"Application application_1399541193872_0009 submitted by user hdfs
to unknown queue: a1",
 				"clusterId":1399541193872,
 				"applicationType":"MAPREDUCE",
 				"applicationTags":"",

http://git-wip-us.apache.org/repos/asf/knox/blob/21ad0162/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.xml
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.xml
b/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.xml
index 731c99c..ad11446 100644
--- a/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.xml
+++ b/gateway-test/src/test/resources/org/apache/hadoop/gateway/GatewayBasicFuncTest/yarn/apps.xml
@@ -70,8 +70,9 @@ limitations under the License.
 		<state>FAILED</state>
 		<finalStatus>FAILED</finalStatus>
 		<progress>0.0</progress>
-		<trackingUI>UNASSIGNED</trackingUI>
-		<diagnostics>Application application_1399541193872_0009 submitted by user hdfs to
unknown queue: a1</diagnostics>
+		<trackingUI>History</trackingUI>
+    <trackingUrl>http://localhost:8088/cluster/app/application_1409008107556_0001</trackingUrl>
+    <diagnostics>Application application_1399541193872_0009 submitted by user hdfs
to unknown queue: a1</diagnostics>
 		<clusterId>1399541193872</clusterId>
 		<applicationType>MAPREDUCE</applicationType>
 		<applicationTags></applicationTags>


Mime
View raw message