Repository: hadoop Updated Branches: refs/heads/branch-2.7 5fe29062e -> e5cb9d9e1
HDFS-8721. Add a metric for number of encryption zones. Contributed by Rakesh R. (cherry picked from commit cb03768b1b2250b9b5a7944cf6ef918e8a974e20) (cherry picked from commit 57d55d40dd41ba4449b91c4676131b6b840052c4) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a1d8e421 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a1d8e421 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a1d8e421 Branch: refs/heads/branch-2.7 Commit: a1d8e421f698c496f80428ddb0b9be4e1733e2e8 Parents: 5fe2906 Author: cnauroth <cnaur...@apache.org> Authored: Tue Jul 21 13:55:58 2015 -0700 Committer: Zhe Zhang <z...@apache.org> Committed: Thu Aug 25 09:39:27 2016 -0700 ---------------------------------------------------------------------- .../hadoop-common/src/site/markdown/Metrics.md | 1 + .../hadoop/hdfs/server/namenode/EncryptionZoneManager.java | 7 +++++++ .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 6 ++++++ .../hdfs/server/namenode/metrics/FSNamesystemMBean.java | 5 +++++ .../test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java | 6 ++++++ .../hadoop/hdfs/server/namenode/TestFSNamesystemMBean.java | 5 +++++ 6 files changed, 30 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a1d8e421/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 01a8d5b..695641e 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md @@ -215,6 +215,7 @@ Each metrics record contains tags such as HAState and Hostname as additional inf | `TotalLoad` | Current number of connections | | `SnapshottableDirectories` | Current number of snapshottable directories | | `Snapshots` | Current number of snapshots | +| `NumEncryptionZones` | Current number of encryption zones | | `BlocksTotal` | Current number of allocated blocks in the system | | `FilesTotal` | Current number of files and directories | | `PendingReplicationBlocks` | Current number of blocks pending to be replicated | http://git-wip-us.apache.org/repos/asf/hadoop/blob/a1d8e421/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java index bda7aba..b30b2f8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java @@ -387,6 +387,13 @@ public class EncryptionZoneManager { } /** + * @return number of encryption zones. + */ + public int getNumEncryptionZones() { + return encryptionZones.size(); + } + + /** * @return Whether there has been any attempt to create an encryption zone in * the cluster at all. If not, it is safe to quickly return null when * checking the encryption information of any file or directory in the http://git-wip-us.apache.org/repos/asf/hadoop/blob/a1d8e421/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 1031010..cd1fe4b 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 @@ -4930,6 +4930,12 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, return JSON.toString(info); } + @Override // FSNamesystemMBean + @Metric({ "NumEncryptionZones", "The number of encryption zones" }) + public int getNumEncryptionZones() { + return dir.ezManager.getNumEncryptionZones(); + } + int getNumberOfDatanodes(DatanodeReportType type) { readLock(); try { http://git-wip-us.apache.org/repos/asf/hadoop/blob/a1d8e421/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/metrics/FSNamesystemMBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/metrics/FSNamesystemMBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/metrics/FSNamesystemMBean.java index b31b7b6..580cb78 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/metrics/FSNamesystemMBean.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/metrics/FSNamesystemMBean.java @@ -184,4 +184,9 @@ public interface FSNamesystemMBean { * @return JSON string */ public String getTopUserOpCounts(); + + /** + * Return the number of encryption zones in the system. + */ + int getNumEncryptionZones(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/a1d8e421/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java index 8e2fbdd..2a05a94 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java @@ -100,6 +100,8 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyString; import static org.apache.hadoop.hdfs.DFSTestUtil.verifyFilesEqual; import static org.apache.hadoop.test.GenericTestUtils.assertExceptionContains; +import static org.apache.hadoop.test.MetricsAsserts.assertGauge; +import static org.apache.hadoop.test.MetricsAsserts.getMetrics; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; @@ -123,6 +125,7 @@ public class TestEncryptionZones { protected DistributedFileSystem fs; private File testRootDir; protected final String TEST_KEY = "test_key"; + private static final String NS_METRICS = "FSNamesystem"; protected FileSystemTestWrapper fsWrapper; protected FileContextTestWrapper fcWrapper; @@ -361,6 +364,9 @@ public class TestEncryptionZones { fs.setSafeMode(SafeModeAction.SAFEMODE_LEAVE); cluster.restartNameNode(true); assertNumZones(numZones); + assertEquals("Unexpected number of encryption zones!", numZones, cluster + .getNamesystem().getNumEncryptionZones()); + assertGauge("NumEncryptionZones", numZones, getMetrics(NS_METRICS)); assertZonePresent(null, zone1.toString()); // Verify newly added ez is present after restarting the NameNode http://git-wip-us.apache.org/repos/asf/hadoop/blob/a1d8e421/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystemMBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystemMBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystemMBean.java index c044fb0..fb3179a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystemMBean.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystemMBean.java @@ -117,6 +117,11 @@ public class TestFSNamesystemMBean { "PendingDeletionBlocks"); assertNotNull(pendingDeletionBlocks); assertTrue(pendingDeletionBlocks instanceof Long); + + Object encryptionZones = mbs.getAttribute(mxbeanName, + "NumEncryptionZones"); + assertNotNull(encryptionZones); + assertTrue(encryptionZones instanceof Integer); } finally { if (cluster != null) { cluster.shutdown(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
