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/09dab88d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/09dab88d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/09dab88d Branch: refs/heads/HDFS-6581 Commit: 09dab88d3eeb9947211b075d8103f9b836a61e8a Parents: 222bf0f db890ee Author: arp <a...@apache.org> Authored: Sat Sep 20 10:34:45 2014 -0700 Committer: arp <a...@apache.org> Committed: Sat Sep 20 10:34:45 2014 -0700 ---------------------------------------------------------------------- .../util/ZKSignerSecretProvider.java | 2 + hadoop-common-project/hadoop-common/CHANGES.txt | 9 + hadoop-common-project/hadoop-common/pom.xml | 13 + .../hadoop/io/VersionMismatchException.java | 2 +- .../main/java/org/apache/hadoop/ipc/Client.java | 68 +- .../apache/hadoop/ipc/ProtobufRpcEngine.java | 22 +- .../main/java/org/apache/hadoop/ipc/RPC.java | 38 +- .../java/org/apache/hadoop/ipc/RpcEngine.java | 9 + .../apache/hadoop/ipc/WritableRpcEngine.java | 27 +- .../metrics/util/MetricsDynamicMBeanBase.java | 2 +- .../AbstractDelegationTokenSecretManager.java | 132 +++- .../ZKDelegationTokenSecretManager.java | 727 +++++++++++++++++++ .../DelegationTokenAuthenticationFilter.java | 10 + .../DelegationTokenAuthenticationHandler.java | 26 +- .../delegation/web/DelegationTokenManager.java | 76 +- .../org/apache/hadoop/util/DiskChecker.java | 2 +- .../java/org/apache/hadoop/ipc/TestRPC.java | 12 +- .../token/delegation/TestDelegationToken.java | 4 +- .../TestZKDelegationTokenSecretManager.java | 68 ++ .../web/TestDelegationTokenManager.java | 17 +- .../hadoop-kms/src/main/conf/kms-acls.xml | 12 +- .../hadoop-kms/src/main/conf/kms-site.xml | 47 +- .../hadoop/crypto/key/kms/server/KMSAudit.java | 14 +- .../crypto/key/kms/server/KMSConfiguration.java | 6 +- .../hadoop/crypto/key/kms/server/KMSWebApp.java | 4 +- .../crypto/key/kms/server/TestKMSWithZK.java | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 8 + .../java/org/apache/hadoop/hdfs/DFSClient.java | 23 +- .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 4 + .../java/org/apache/hadoop/hdfs/HAUtil.java | 2 +- .../org/apache/hadoop/hdfs/NameNodeProxies.java | 74 +- .../sasl/SaslDataTransferClient.java | 48 +- .../sasl/SaslDataTransferServer.java | 26 +- .../hadoop/hdfs/server/balancer/Dispatcher.java | 7 +- .../hdfs/server/balancer/NameNodeConnector.java | 4 +- .../hadoop/hdfs/server/datanode/DNConf.java | 17 + .../hadoop/hdfs/server/datanode/DataNode.java | 26 +- .../hdfs/server/namenode/FSNamesystem.java | 6 +- .../hdfs/server/namenode/NamenodeFsck.java | 20 +- .../ha/AbstractNNFailoverProxyProvider.java | 14 + .../ha/ConfiguredFailoverProxyProvider.java | 2 +- .../datatransfer/sasl/TestSaslDataTransfer.java | 45 +- .../hdfs/qjournal/server/TestJournalNode.java | 2 +- .../namenode/ha/TestRetryCacheWithHA.java | 2 +- hadoop-mapreduce-project/CHANGES.txt | 4 + .../resources/job_1329348432655_0001_conf.xml | 1 - .../hadoop/mapred/ClientServiceDelegate.java | 3 + .../mapred/TestClientServiceDelegate.java | 8 +- .../hadoop/mapreduce/v2/TestNonExistentJob.java | 9 +- hadoop-project/pom.xml | 10 + .../hadoop/fs/azure/NativeAzureFileSystem.java | 2 +- .../apache/hadoop/mapred/gridmix/Gridmix.java | 2 +- .../src/main/data/2jobs2min-rumen-jh.json | 6 +- .../org/apache/hadoop/streaming/StreamJob.java | 2 +- hadoop-yarn-project/CHANGES.txt | 6 + .../src/main/resources/yarn-default.xml | 39 +- .../ApplicationHistoryServer.java | 4 +- .../ahs/RMApplicationHistoryWriter.java | 49 +- .../ahs/TestRMApplicationHistoryWriter.java | 18 + 59 files changed, 1557 insertions(+), 287 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/09dab88d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/09dab88d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/09dab88d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java ----------------------------------------------------------------------
