You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by vi...@apache.org on 2013/03/02 02:21:54 UTC
svn commit: r1451808 - in /hadoop/common/trunk/hadoop-yarn-project: ./
hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/
hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/
Author: vinodkv
Date: Sat Mar 2 01:21:53 2013
New Revision: 1451808
URL: http://svn.apache.org/r1451808
Log:
YARN-410. Fixed RM UI so that the new lines diagnostics for a failed app on the per-application page are translated to html line breaks. Contributed by Omkar Vinit Joshi.
Added:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/InfoBlock.java
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1451808&r1=1451807&r2=1451808&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Sat Mar 2 01:21:53 2013
@@ -28,6 +28,10 @@ Release 2.0.4-beta - UNRELEASED
YARN-380. Fix yarn node -status output to be better readable. (Omkar Vinit
Joshi via vinodkv)
+ YARN-410. Fixed RM UI so that the new lines diagnostics for a failed app on
+ the per-application page are translated to html line breaks. (Omkar Vinit
+ Joshi via vinodkv)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/InfoBlock.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/InfoBlock.java?rev=1451808&r1=1451807&r2=1451808&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/InfoBlock.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/InfoBlock.java Sat Mar 2 01:21:53 2013
@@ -20,7 +20,11 @@ package org.apache.hadoop.yarn.webapp.vi
import org.apache.hadoop.yarn.webapp.ResponseInfo;
import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
-import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.*;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.DIV;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TABLE;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TD;
+import org.apache.hadoop.yarn.webapp.hamlet.Hamlet.TR;
+
import com.google.inject.Inject;
@@ -47,7 +51,19 @@ public class InfoBlock extends HtmlBlock
String value = String.valueOf(item.value);
if (item.url == null) {
if (!item.isRaw) {
- tr.td(value);
+ TD<TR<TABLE<DIV<Hamlet>>>> td = tr.td();
+ if ( value.lastIndexOf('\n') > 0) {
+ String []lines = value.split("\n");
+ DIV<TD<TR<TABLE<DIV<Hamlet>>>>> singleLineDiv;
+ for ( String line :lines) {
+ singleLineDiv = td.div();
+ singleLineDiv._r(line);
+ singleLineDiv._();
+ }
+ } else {
+ td._r(value);
+ }
+ td._();
} else {
tr.td()._r(value)._();
}
Added: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java?rev=1451808&view=auto
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java (added)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java Sat Mar 2 01:21:53 2013
@@ -0,0 +1,81 @@
+/**
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.hadoop.yarn.webapp.view;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import static org.junit.Assert.assertTrue;
+
+import org.apache.hadoop.yarn.webapp.ResponseInfo;
+import org.apache.hadoop.yarn.webapp.test.WebAppTests;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestInfoBlock {
+
+ public static StringWriter sw;
+
+ public static PrintWriter pw;
+
+ public static class MultilineInfoBlock extends InfoBlock{
+
+ static ResponseInfo resInfo;
+
+ static {
+ resInfo = new ResponseInfo();
+ resInfo._("Single_line_value", "This is one line.");
+ resInfo._("Multiple_line_value", "This is first line.\nThis is second line.");
+ }
+
+ @Override
+ public PrintWriter writer() {
+ return TestInfoBlock.pw;
+ }
+
+ MultilineInfoBlock(ResponseInfo info) {
+ super(resInfo);
+ }
+
+ public MultilineInfoBlock() {
+ super(resInfo);
+ }
+ }
+
+ @Before
+ public void setup() {
+ sw = new StringWriter();
+ pw = new PrintWriter(sw);
+ }
+
+ @Test(timeout=60000L)
+ public void testMultilineInfoBlock() throws Exception{
+
+ WebAppTests.testBlock(MultilineInfoBlock.class);
+ TestInfoBlock.pw.flush();
+ String output = TestInfoBlock.sw.toString().replaceAll(" +", " ");
+ String expectedSinglelineData = "<tr class=\"odd\">\n"
+ + " <th>\n Single_line_value\n <td>\n This is one line.\n";
+ String expectedMultilineData = "<tr class=\"even\">\n"
+ + " <th>\n Multiple_line_value\n <td>\n <div>\n"
+ + " This is first line.\n </div>\n <div>\n"
+ + " This is second line.\n </div>\n";
+ assertTrue(output.contains(expectedSinglelineData) && output.contains(expectedMultilineData));
+ }
+}
\ No newline at end of file