Revert "HDFS-9210. Fix some misuse of %n in VolumeScanner#printStats. Contributed by Xiaoyu Yao."
This reverts commit 3d5085595286c0231f66543d1509247ad4bb5739. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a8070259 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a8070259 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a8070259 Branch: refs/heads/HDFS-7966 Commit: a8070259f8384021bd6196e7343f1cc23de89b1c Parents: 3d50855 Author: Xiaoyu Yao <x...@apache.org> Authored: Wed Oct 14 14:41:13 2015 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Wed Oct 14 14:41:13 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/a8070259/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 3c66951..127cb0d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -2060,8 +2060,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/a8070259/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"); } }
