HDFS-5165. Remove the TotalFiles metrics. Contributed by Akira AJISAKA.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db4cab21 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db4cab21 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db4cab21 Branch: refs/heads/yarn-2877 Commit: db4cab21f4c661f68d6a6dec50aae00d75168486 Parents: 17b1a54 Author: Haohui Mai <whe...@apache.org> Authored: Tue Nov 24 11:41:57 2015 -0800 Committer: Haohui Mai <whe...@apache.org> Committed: Tue Nov 24 11:41:57 2015 -0800 ---------------------------------------------------------------------- .../hadoop-common/src/site/markdown/Metrics.md | 1 - hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 8 -------- .../hadoop/hdfs/server/namenode/NameNodeMXBean.java | 10 ---------- 4 files changed, 2 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/db4cab21/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md b/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md index 9e02ffa..a91bbad 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md @@ -231,7 +231,6 @@ Each metrics record contains tags such as HAState and Hostname as additional inf | `MillisSinceLastLoadedEdits` | (HA-only) Time in milliseconds since the last time standby NameNode load edit log. In active NameNode, set to 0 | | `BlockCapacity` | Current number of block capacity | | `StaleDataNodes` | Current number of DataNodes marked stale due to delayed heartbeat | -| `TotalFiles` | Deprecated: Use FilesTotal instead | | `MissingReplOneBlocks` | Current number of missing blocks with replication factor 1 | | `NumFilesUnderConstruction` | Current number of files under construction | | `NumActiveClients` | Current number of active clients holding lease | http://git-wip-us.apache.org/repos/asf/hadoop/blob/db4cab21/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 b441b35..639b8f3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -44,6 +44,8 @@ Trunk (Unreleased) HDFS-9278. Fix preferredBlockSize typo in OIV XML output. (Nicole Pazmany via wang) + HDFS-5165. Remove the TotalFiles metrics. (Akira Ajisaka via wheat9) + NEW FEATURES HDFS-3125. Add JournalService to enable Journal Daemon. (suresh) http://git-wip-us.apache.org/repos/asf/hadoop/blob/db4cab21/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index 8d77630..0559288 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -6001,14 +6001,6 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, return getBlocksTotal(); } - /** @deprecated Use {@link #getFilesTotal()} instead. */ - @Deprecated - @Override // NameNodeMXBean - @Metric - public long getTotalFiles() { - return getFilesTotal(); - } - @Override // NameNodeMXBean public long getNumberOfMissingBlocks() { return getMissingBlocksCount(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/db4cab21/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java index 3f78155..c0d256a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeMXBean.java @@ -139,16 +139,6 @@ public interface NameNodeMXBean { public long getTotalBlocks(); /** - * Gets the total number of files on the cluster - * - * @return the total number of files on the cluster - * @deprecated Use - * {@link org.apache.hadoop.hdfs.server.namenode.metrics.FSNamesystemMBean#getFilesTotal()} instead. - */ - @Deprecated - public long getTotalFiles(); - - /** * Gets the total number of missing blocks on the cluster * * @return the total number of missing blocks on the cluster