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 su...@apache.org on 2012/10/25 16:38:31 UTC
svn commit: r1402169 - in
/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common:
CHANGES.branch-trunk-win.txt
src/main/java/org/apache/hadoop/metrics/MetricsServlet.java
Author: suresh
Date: Thu Oct 25 14:38:30 2012
New Revision: 1402169
URL: http://svn.apache.org/viewvc?rev=1402169&view=rev
Log:
HADOOP-8960. TestMetricsServlet fails on Windows. Contributed by Ivan Mitic.
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt?rev=1402169&r1=1402168&r2=1402169&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt Thu Oct 25 14:38:30 2012
@@ -23,3 +23,5 @@ branch-trunk-win changes - unreleased
HADOOP-8955. "chmod" executable not found on Windows.
(Chris Nauroth via suresh)
+
+ HADOOP-8960. TestMetricsServlet fails on Windows. (Ivan Mitic via suresh)
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java?rev=1402169&r1=1402168&r2=1402169&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/MetricsServlet.java Thu Oct 25 14:38:30 2012
@@ -140,10 +140,12 @@ public class MetricsServlet extends Http
*/
void printMap(PrintWriter out, Map<String, Map<String, List<TagsMetricsPair>>> map) {
for (Map.Entry<String, Map<String, List<TagsMetricsPair>>> context : map.entrySet()) {
- out.println(context.getKey());
+ out.print(context.getKey());
+ out.print("\n");
for (Map.Entry<String, List<TagsMetricsPair>> record : context.getValue().entrySet()) {
indent(out, 1);
- out.println(record.getKey());
+ out.print(record.getKey());
+ out.print("\n");
for (TagsMetricsPair pair : record.getValue()) {
indent(out, 2);
// Prints tag values in the form "{key=value,key=value}:"
@@ -159,7 +161,7 @@ public class MetricsServlet extends Http
out.print("=");
out.print(tagValue.getValue().toString());
}
- out.println("}:");
+ out.print("}:\n");
// Now print metric values, one per line
for (Map.Entry<String, Number> metricValue :
@@ -167,7 +169,8 @@ public class MetricsServlet extends Http
indent(out, 3);
out.print(metricValue.getKey());
out.print("=");
- out.println(metricValue.getValue().toString());
+ out.print(metricValue.getValue().toString());
+ out.print("\n");
}
}
}