hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From x...@apache.org
Subject hadoop git commit: Revert "HDFS-9210. Fix some misuse of %n in VolumeScanner#printStats. Contributed by Xiaoyu Yao."
Date Wed, 14 Oct 2015 21:43:24 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 c1f68b3cd -> 88e67a958


Revert "HDFS-9210. Fix some misuse of %n in VolumeScanner#printStats. Contributed by Xiaoyu
Yao."

This reverts commit c1f68b3cd94154e4029e1a81232a5ca25660de86.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/88e67a95
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/88e67a95
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/88e67a95

Branch: refs/heads/branch-2
Commit: 88e67a9583fc13ab928ca23e4d13fe44e22e9921
Parents: c1f68b3
Author: Xiaoyu Yao <xyao@apache.org>
Authored: Wed Oct 14 14:42:02 2015 -0700
Committer: Xiaoyu Yao <xyao@apache.org>
Committed: Wed Oct 14 14:42:02 2015 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                   | 2 --
 .../org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java | 7 ++++---
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/88e67a95/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index c6bf5c4..85a6aa6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1234,8 +1234,6 @@ Release 2.8.0 - UNRELEASED
     HDFS-9187. Fix null pointer error in Globber when FS was not constructed
     via FileSystem#createFileSystem (cmccabe)
 
-    HDFS-9210. Fix some misuse of %n in VolumeScanner#printStats. (xyao)
-
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/88e67a95/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java
index d6700f0..212e13b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java
@@ -216,8 +216,9 @@ public class VolumeScanner extends Thread {
   }
 
   public void printStats(StringBuilder p) {
-    p.append(String.format("Block scanner information for volume %s with base" +
-        " path %s%n" + volume.getStorageID(), volume.getBasePath()));
+    p.append("Block scanner information for volume " +
+        volume.getStorageID() + " with base path " + volume.getBasePath() +
+        "%n");
     synchronized (stats) {
       p.append(String.format("Bytes verified in last hour       : %57d%n",
           stats.bytesScannedInPastHour));
@@ -244,7 +245,7 @@ public class VolumeScanner extends Thread {
           stats.lastBlockScanned.toString())));
       p.append(String.format("More blocks to scan in period     : %57s%n",
           !stats.eof));
-      p.append(String.format("%n"));
+      p.append("%n");
     }
   }
 


Mime
View raw message