Repository: hadoop Updated Branches: refs/heads/branch-2 5cdb24d4b -> dd3e28d43
HDFS-7061. Add test to verify encryption zone creation after NameNode restart without saving namespace. Contributed by Stephen Chu. (cherry picked from commit fc741b5d78e7e006355e17b1b5839f502e37261b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd3e28d4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd3e28d4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd3e28d4 Branch: refs/heads/branch-2 Commit: dd3e28d434e32c2c312856a987883b056c28b8ae Parents: 5cdb24d Author: Andrew Wang <w...@apache.org> Authored: Sun Sep 14 23:48:24 2014 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Sun Sep 14 23:49:26 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/TestEncryptionZones.java | 10 ++++++++++ 2 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd3e28d4/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 8ac8dc3..7a42ea9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -197,6 +197,9 @@ Release 2.6.0 - UNRELEASED HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via Colin Patrick McCabe) + HDFS-7061. Add test to verify encryption zone creation after NameNode + restart without saving namespace. (Stephen Chu via wang) + OPTIMIZATIONS HDFS-6690. Deduplicate xattr names in memory. (wang) http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd3e28d4/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 db3c085..b3bf5d9 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 @@ -338,6 +338,16 @@ public class TestEncryptionZones { cluster.restartNameNode(true); assertNumZones(numZones); assertZonePresent(null, zone1.toString()); + + // Verify newly added ez is present after restarting the NameNode + // without persisting the namespace. + Path nonpersistZone = new Path("/nonpersistZone"); + fsWrapper.mkdir(nonpersistZone, FsPermission.getDirDefault(), false); + dfsAdmin.createEncryptionZone(nonpersistZone, TEST_KEY); + numZones++; + cluster.restartNameNode(true); + assertNumZones(numZones); + assertZonePresent(null, nonpersistZone.toString()); } /**
