Merge remote-tracking branch 'apache/trunk' into MR-2841
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4b3f1e2c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4b3f1e2c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4b3f1e2c Branch: refs/heads/MR-2841 Commit: 4b3f1e2ce48124b7406d77cc2ae1d0914311b0d4 Parents: 683987b c6107f5 Author: Todd Lipcon <t...@apache.org> Authored: Fri Sep 5 10:47:27 2014 -0700 Committer: Todd Lipcon <t...@apache.org> Committed: Fri Sep 5 10:47:27 2014 -0700 ---------------------------------------------------------------------- LICENSE.txt | 290 ++++++++++++++++ NOTICE.txt | 2 + README.txt | 31 ++ dev-support/create-release.sh | 24 +- .../main/resources/assemblies/hadoop-src.xml | 8 + hadoop-common-project/hadoop-common/CHANGES.txt | 20 ++ hadoop-common-project/hadoop-common/LICENSE.txt | 290 ---------------- hadoop-common-project/hadoop-common/NOTICE.txt | 2 - hadoop-common-project/hadoop-common/README.txt | 31 -- .../dev-support/findbugsExcludeFile.xml | 2 +- .../hadoop/crypto/key/KeyProviderFactory.java | 36 +- .../crypto/key/kms/KMSClientProvider.java | 57 +--- .../hadoop/crypto/random/OsSecureRandom.java | 21 +- .../security/authorize/AccessControlList.java | 12 +- .../DelegationTokenAuthenticationFilter.java | 15 +- .../DelegationTokenAuthenticationHandler.java | 6 +- .../web/DelegationTokenAuthenticator.java | 20 +- .../apache/hadoop/util/HttpExceptionUtils.java | 185 ++++++++++ .../apache/hadoop/crypto/TestCryptoCodec.java | 69 +++- .../apache/hadoop/crypto/TestCryptoStreams.java | 2 +- .../crypto/key/TestKeyProviderFactory.java | 13 + .../crypto/random/TestOsSecureRandom.java | 15 + ...tionTokenAuthenticationHandlerWithMocks.java | 35 +- .../hadoop/util/TestHttpExceptionUtils.java | 167 +++++++++ hadoop-common-project/hadoop-kms/pom.xml | 1 + .../hadoop/crypto/key/kms/server/KMS.java | 27 +- .../hadoop/crypto/key/kms/server/KMSACLs.java | 55 ++- .../key/kms/server/KMSExceptionsProvider.java | 12 +- .../hadoop-kms/src/site/apt/index.apt.vm | 88 ++++- .../hadoop/crypto/key/kms/server/TestKMS.java | 100 +++++- .../crypto/key/kms/server/TestKMSACLs.java | 2 +- hadoop-dist/pom.xml | 3 + .../hadoop/fs/http/client/HttpFSFileSystem.java | 70 ++-- .../hadoop/fs/http/client/HttpFSUtils.java | 50 --- .../hadoop/lib/wsrs/ExceptionProvider.java | 14 +- .../fs/http/client/BaseTestHttpFSWith.java | 4 +- .../fs/http/server/TestHttpFSServerNoACLs.java | 10 +- .../hadoop/hdfs/nfs/nfs3/OpenFileCtx.java | 6 +- .../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 25 ++ hadoop-hdfs-project/hadoop-hdfs/LICENSE.txt | 271 --------------- hadoop-hdfs-project/hadoop-hdfs/NOTICE.txt | 2 - .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 3 + .../java/org/apache/hadoop/hdfs/DFSUtil.java | 80 ++++- .../hadoop/hdfs/DistributedFileSystem.java | 11 +- .../org/apache/hadoop/hdfs/inotify/Event.java | 12 + .../apache/hadoop/hdfs/protocolPB/PBHelper.java | 6 +- .../hdfs/server/datanode/BlockPoolManager.java | 12 +- .../hadoop/hdfs/server/datanode/DataNode.java | 2 +- .../hdfs/server/datanode/DataStorage.java | 2 +- .../hdfs/server/namenode/FSDirectory.java | 44 ++- .../hadoop/hdfs/server/namenode/FSEditLog.java | 6 +- .../hdfs/server/namenode/FSEditLogLoader.java | 8 +- .../hdfs/server/namenode/FSEditLogOp.java | 18 + .../server/namenode/FSImageSerialization.java | 17 + .../hdfs/server/namenode/FSNamesystem.java | 60 ++-- .../hdfs/server/namenode/INodeReference.java | 4 +- .../namenode/InotifyFSEditLogOpTranslator.java | 1 + .../server/namenode/NameNodeLayoutVersion.java | 4 +- .../snapshot/DirectorySnapshottableFeature.java | 2 +- .../org/apache/hadoop/hdfs/tools/GetConf.java | 4 +- .../hadoop-hdfs/src/main/proto/inotify.proto | 1 + .../src/main/resources/hdfs-default.xml | 18 + .../hadoop/hdfs/TestBlocksScheduledCounter.java | 18 +- .../hdfs/TestDFSInotifyEventInputStream.java | 8 +- .../org/apache/hadoop/hdfs/TestDFSRename.java | 6 + .../org/apache/hadoop/hdfs/TestDFSUtil.java | 26 ++ .../org/apache/hadoop/hdfs/TestFileAppend4.java | 2 +- .../apache/hadoop/hdfs/TestFileCreation.java | 119 +++++++ .../org/apache/hadoop/hdfs/TestLocalDFS.java | 29 +- .../server/datanode/TestBlockPoolManager.java | 22 ++ .../hdfs/server/namenode/CreateEditsLog.java | 2 +- .../hdfs/server/namenode/TestEditLog.java | 2 +- .../hdfs/server/namenode/TestStartup.java | 2 +- .../snapshot/TestSnapshotDiffReport.java | 36 ++ .../apache/hadoop/hdfs/tools/TestGetConf.java | 26 +- .../hadoop-hdfs/src/test/resources/editsStored | Bin 4992 -> 5252 bytes .../src/test/resources/editsStored.xml | 182 ++++++---- hadoop-mapreduce-project/CHANGES.txt | 6 + hadoop-mapreduce-project/LICENSE.txt | 341 ------------------- hadoop-mapreduce-project/NOTICE.txt | 2 - .../mapreduce/v2/app/job/impl/JobImpl.java | 2 + .../java/org/apache/hadoop/mapred/MapTask.java | 4 +- hadoop-yarn-project/CHANGES.txt | 12 + hadoop-yarn-project/LICENSE.txt | 341 ------------------- hadoop-yarn-project/NOTICE.txt | 17 - .../hadoop/yarn/conf/YarnConfiguration.java | 8 + .../ApplicationHistoryServer.java | 19 +- .../timeline/webapp/CrossOriginFilter.java | 10 +- .../timeline/webapp/TestCrossOriginFilter.java | 15 + .../nodemanager/LinuxContainerExecutor.java | 11 + .../nodemanager/TestLinuxContainerExecutor.java | 60 ++++ .../scheduler/fair/AllocationConfiguration.java | 22 +- .../fair/AllocationFileLoaderService.java | 48 ++- .../scheduler/fair/FSLeafQueue.java | 54 ++- .../scheduler/fair/FSParentQueue.java | 6 +- .../resourcemanager/scheduler/fair/FSQueue.java | 23 +- .../scheduler/fair/FairScheduler.java | 60 +--- .../scheduler/fair/QueueManager.java | 32 +- .../fair/TestAllocationFileLoaderService.java | 45 ++- .../scheduler/fair/TestFSLeafQueue.java | 198 +++++++++-- .../scheduler/fair/TestFairScheduler.java | 158 ++------- .../src/site/apt/FairScheduler.apt.vm | 10 + 103 files changed, 2395 insertions(+), 1999 deletions(-) ----------------------------------------------------------------------
