Repository: hadoop Updated Branches: refs/heads/branch-2 eb7068c2c -> dadda2edc
HDFS-8004. Use KeyProviderCryptoExtension#warmUpEncryptedKeys when creating an encryption zone. (awang via asuresh) (cherry picked from commit e97f8e44af9dffc42c030278425cffe0c9da723b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dadda2ed Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dadda2ed Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dadda2ed Branch: refs/heads/branch-2 Commit: dadda2edcafdbd645d837b9998c3ad756d2414a3 Parents: eb7068c Author: Arun Suresh <asur...@apache.org> Authored: Fri Mar 27 19:23:45 2015 -0700 Committer: Arun Suresh <asur...@apache.org> Committed: Fri Mar 27 19:25:32 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dadda2ed/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 09bbfaa..3b17de0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -29,6 +29,9 @@ Release 2.8.0 - UNRELEASED HDFS-7990. IBR delete ack should not be delayed. (daryn via kihwal) + HDFS-8004. Use KeyProviderCryptoExtension#warmUpEncryptedKeys when creating + an encryption zone. (awang via asuresh) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/dadda2ed/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 7378c86..04d9d67 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 @@ -7955,7 +7955,7 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean, throw new IOException("Key " + keyName + " doesn't exist."); } // If the provider supports pool for EDEKs, this will fill in the pool - generateEncryptedDataEncryptionKey(keyName); + provider.warmUpEncryptedKeys(keyName); createEncryptionZoneInt(src, metadata.getCipher(), keyName, logRetryCache); } catch (AccessControlException e) {
