Repository: hadoop Updated Branches: refs/heads/branch-2.8 7bb48ed16 -> 924e1583e
HDFS-9210. Fix some misuse of %n in VolumeScanner#printStats. Contributed by Xiaoyu Yao. (cherry picked from commit b11008d54d8aa3eb9c7c10c3a0734d95b9ef41e9) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/924e1583 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/924e1583 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/924e1583 Branch: refs/heads/branch-2.8 Commit: 924e1583ed6dc555dd55bfcb5ed5c08215121631 Parents: 7bb48ed Author: Xiaoyu Yao <x...@apache.org> Authored: Mon Feb 1 11:55:27 2016 -0800 Committer: Xiaoyu Yao <x...@apache.org> Committed: Mon Feb 1 11:57:51 2016 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/924e1583/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 89c9e96..16c4f55 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1690,6 +1690,9 @@ Release 2.8.0 - UNRELEASED HDFS-9708. FSNamesystem.initAuditLoggers() doesn't trim classnames (Mingliang Liu via stevel) + HDFS-9210. Fix some misuse of %n in VolumeScanner#printStats. + (Xiaoyu Yao) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/924e1583/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 212e13b..d1f2d05 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,9 +216,8 @@ public class VolumeScanner extends Thread { } public void printStats(StringBuilder p) { - p.append("Block scanner information for volume " + - volume.getStorageID() + " with base path " + volume.getBasePath() + - "%n"); + p.append(String.format("Block scanner information for volume %s with base" + + " path %s%n", volume.getStorageID(), volume.getBasePath())); synchronized (stats) { p.append(String.format("Bytes verified in last hour : %57d%n", stats.bytesScannedInPastHour)); @@ -245,7 +244,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("%n"); + p.append(System.lineSeparator()); } }
