Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a24a9331 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a24a9331 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a24a9331 Branch: refs/heads/HDFS-6581 Commit: a24a9331d4f06f1a6aca00bc3d9c498a7f7ba5aa Parents: 4603e44 90a0c03 Author: arp <a...@apache.org> Authored: Tue Sep 16 18:18:09 2014 -0700 Committer: arp <a...@apache.org> Committed: Tue Sep 16 18:18:09 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 5 + .../hadoop-common/src/main/bin/hadoop-config.sh | 1 + .../src/main/bin/hadoop-functions.sh | 9 + .../hadoop-common/src/main/conf/hadoop-env.sh | 81 ------ .../main/conf/hadoop-user-functions.sh.example | 94 +++++++ .../src/site/apt/CommandsManual.apt.vm | 53 ++++ hadoop-common-project/hadoop-kms/pom.xml | 25 +- .../hadoop/crypto/key/kms/server/MiniKMS.java | 47 +++- .../test/resources/mini-kms-acls-default.xml | 135 ++++++++++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 8 + hadoop-hdfs-project/hadoop-hdfs/pom.xml | 13 + .../hadoop-hdfs/src/main/bin/hdfs-config.sh | 7 +- .../java/org/apache/hadoop/hdfs/DFSClient.java | 5 +- .../hadoop/hdfs/protocol/ClientProtocol.java | 4 +- .../hadoop/hdfs/protocol/EncryptionZone.java | 18 +- .../hdfs/protocol/EncryptionZoneIterator.java | 20 +- .../hdfs/protocol/EncryptionZoneWithId.java | 81 ------ .../protocol/EncryptionZoneWithIdIterator.java | 53 ---- ...tNamenodeProtocolServerSideTranslatorPB.java | 6 +- .../ClientNamenodeProtocolTranslatorPB.java | 14 +- .../apache/hadoop/hdfs/protocolPB/PBHelper.java | 12 +- .../server/namenode/EncryptionZoneManager.java | 24 +- .../hdfs/server/namenode/FSDirectory.java | 6 +- .../hdfs/server/namenode/FSNamesystem.java | 10 +- .../hdfs/server/namenode/NameNodeRpcServer.java | 6 +- .../hadoop-hdfs/src/main/proto/encryption.proto | 6 +- .../hadoop/hdfs/TestDFSClientFailover.java | 5 +- .../apache/hadoop/hdfs/TestEncryptionZones.java | 10 +- .../hadoop/hdfs/TestEncryptionZonesWithKMS.java | 56 ++++ .../server/datanode/SimulatedFSDataset.java | 7 +- hadoop-mapreduce-project/bin/mapred-config.sh | 7 +- hadoop-project/pom.xml | 14 + .../hadoop-yarn/bin/yarn-config.sh | 11 +- ...pplicationHistoryManagerOnTimelineStore.java | 151 +++++++---- .../ApplicationHistoryServer.java | 11 +- ...pplicationHistoryManagerOnTimelineStore.java | 268 ++++++++++++++++--- .../metrics/ApplicationMetricsConstants.java | 6 + .../server/resourcemanager/RMAppManager.java | 5 + .../metrics/ApplicationACLsUpdatedEvent.java | 45 ++++ .../metrics/SystemMetricsEventType.java | 1 + .../metrics/SystemMetricsPublisher.java | 36 +++ .../server/resourcemanager/TestAppManager.java | 11 +- .../metrics/TestSystemMetricsPublisher.java | 15 +- 43 files changed, 1008 insertions(+), 394 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a24a9331/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a24a9331/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a24a9331/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a24a9331/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java ----------------------------------------------------------------------