Merge branch 'trunk' into HDFS-1312
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3bb9d5e8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3bb9d5e8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3bb9d5e8 Branch: refs/heads/HDFS-1312 Commit: 3bb9d5e8e6ef659f0ebf12a60fd8f610c0afbfad Parents: 0d1c39f dbbfc58 Author: Arpit Agarwal <[email protected]> Authored: Wed Feb 24 16:49:34 2016 -0800 Committer: Arpit Agarwal <[email protected]> Committed: Wed Feb 24 16:49:34 2016 -0800 ---------------------------------------------------------------------- .../client/KerberosAuthenticator.java | 6 +- .../authentication/util/KerberosUtil.java | 28 + hadoop-common-project/hadoop-common/CHANGES.txt | 24 + .../hadoop-common/src/main/bin/hadoop.cmd | 26 +- .../src/main/conf/ssl-server.xml.example | 10 + .../java/org/apache/hadoop/fs/FileSystem.java | 9 +- .../org/apache/hadoop/http/HttpServer2.java | 12 + .../apache/hadoop/io/erasurecode/CodecUtil.java | 4 +- .../io/erasurecode/rawcoder/RSRawDecoder.java | 286 ---- .../rawcoder/RSRawDecoderLegacy.java | 286 ++++ .../io/erasurecode/rawcoder/RSRawEncoder.java | 111 -- .../rawcoder/RSRawEncoderLegacy.java | 111 ++ .../rawcoder/RSRawErasureCoderFactory.java | 37 - .../RSRawErasureCoderFactoryLegacy.java | 37 + .../erasurecode/rawcoder/util/package-info.java | 27 + .../hadoop/security/UserGroupInformation.java | 5 +- .../security/ssl/FileBasedKeyStoresFactory.java | 2 + .../src/site/markdown/CredentialProviderAPI.md | 1 + .../apache/hadoop/http/TestHttpCookieFlag.java | 5 +- .../apache/hadoop/http/TestSSLHttpServer.java | 199 ++- .../coder/TestHHXORErasureCoder.java | 4 +- .../erasurecode/coder/TestRSErasureCoder.java | 4 +- .../io/erasurecode/rawcoder/TestRSRawCoder.java | 34 - .../rawcoder/TestRSRawCoderLegacy.java | 33 + .../hadoop/security/ssl/KeyStoreTestUtil.java | 81 +- .../hadoop/hdfs/DistributedFileSystem.java | 2 +- .../sasl/SaslDataTransferClient.java | 38 +- .../hadoop/hdfs/util/StripedBlockUtil.java | 24 + hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 25 + .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 3 + .../java/org/apache/hadoop/hdfs/DFSUtil.java | 4 +- .../sasl/SaslDataTransferServer.java | 31 +- .../blockmanagement/BlockInfoStriped.java | 46 + .../server/blockmanagement/BlockManager.java | 215 +-- .../CacheReplicationMonitor.java | 27 +- .../server/blockmanagement/DatanodeManager.java | 9 + .../server/blockmanagement/NumberReplicas.java | 86 +- .../server/datanode/BlockPoolSliceStorage.java | 56 +- .../server/datanode/BlockRecoveryWorker.java | 12 +- .../hdfs/server/datanode/DataStorage.java | 146 +- .../hdfs/server/namenode/FSNamesystem.java | 193 ++- .../src/main/webapps/hdfs/explorer.html | 15 +- .../src/main/webapps/hdfs/explorer.js | 38 + .../src/site/markdown/TransparentEncryption.md | 8 +- .../apache/hadoop/hdfs/TestEncryptionZones.java | 14 + .../hadoop/hdfs/TestLeaseRecoveryStriped.java | 58 +- .../TestBlockManagerSafeMode.java | 2 +- .../TestUnderReplicatedBlockQueues.java | 55 +- .../hdfs/server/datanode/TestBlockRecovery.java | 27 +- .../TestAddOverReplicatedStripedBlocks.java | 66 +- .../server/namenode/TestAddStripedBlocks.java | 2 +- .../namenode/TestAuditLoggerWithCommands.java | 584 ++++++++ .../server/namenode/TestCacheDirectives.java | 7 +- .../server/namenode/TestFSEditLogLoader.java | 8 +- .../hdfs/server/namenode/TestFSImage.java | 18 +- .../hadoop/hdfs/server/namenode/TestFsck.java | 23 +- .../namenode/TestReconstructStripedBlocks.java | 114 +- .../test/resources/testErasureCodingConf.xml | 4 +- hadoop-mapreduce-project/CHANGES.txt | 12 + .../apache/hadoop/mapreduce/TypeConverter.java | 3 +- .../mapreduce/v2/api/records/JobReport.java | 2 + .../v2/api/records/impl/pb/JobReportPBImpl.java | 12 + .../src/main/proto/mr_protos.proto | 1 + .../org/apache/hadoop/mapred/JobStatus.java | 74 +- .../org/apache/hadoop/mapreduce/JobStatus.java | 100 +- .../lib/input/UncompressedSplitLineReader.java | 7 +- .../org/apache/hadoop/mapreduce/tools/CLI.java | 57 +- .../src/site/markdown/MapredCommands.md | 4 +- .../hadoop/mapred/TestLineRecordReader.java | 53 + .../hadoop/mapreduce/v2/hs/CompletedJob.java | 1 + .../mapreduce/v2/hs/HistoryFileManager.java | 4 +- .../mapreduce/v2/hs/TestJobHistoryEntities.java | 5 + .../mapreduce/v2/hs/webapp/dao/TestJobInfo.java | 1 + .../hadoop/mapreduce/TestMRJobClient.java | 226 +-- .../resources/job_1329348432655_0001-10.jhist | 51 - .../hadoop/fs/azure/NativeAzureFileSystem.java | 13 +- .../hadoop/fs/azure/SimpleKeyProvider.java | 16 +- .../hadoop-azure/src/site/markdown/index.md | 71 +- .../hadoop/fs/azure/MockStorageInterface.java | 33 +- .../fs/azure/TestWasbUriAndConfiguration.java | 45 +- .../contract/NativeAzureFileSystemContract.java | 37 + .../contract/TestAzureNativeContractAppend.java | 37 + .../contract/TestAzureNativeContractCreate.java | 30 + .../contract/TestAzureNativeContractDelete.java | 30 + .../TestAzureNativeContractGetFileStatus.java | 30 + .../contract/TestAzureNativeContractMkdir.java | 30 + .../contract/TestAzureNativeContractOpen.java | 30 + .../contract/TestAzureNativeContractRename.java | 30 + .../contract/TestAzureNativeContractSeek.java | 30 + .../hadoop-azure/src/test/resources/wasb.xml | 164 +++ hadoop-yarn-project/CHANGES.txt | 26 + .../hadoop/yarn/conf/YarnConfiguration.java | 11 + .../api/impl/FileSystemTimelineWriter.java | 159 ++- .../hadoop/yarn/event/AsyncDispatcher.java | 5 +- .../hadoop/yarn/webapp/util/WebAppUtils.java | 4 +- .../src/main/resources/yarn-default.xml | 47 + .../yarn/webapp/WebServicesTestUtils.java | 28 + .../hadoop/yarn/server/nodemanager/Context.java | 2 + .../yarn/server/nodemanager/NodeManager.java | 10 + .../containermanager/ContainerManagerImpl.java | 12 +- .../container/ContainerImpl.java | 25 +- .../logaggregation/LogAggregationService.java | 35 +- .../nodemanager/webapp/dao/ContainerInfo.java | 1 - .../yarn/server/nodemanager/TestEventFlow.java | 1 + .../nodemanager/TestNodeStatusUpdater.java | 28 +- .../amrmproxy/BaseAMRMProxyTest.java | 5 + .../BaseContainerManagerTest.java | 1 + .../containermanager/TestAuxServices.java | 7 +- .../container/TestContainer.java | 16 +- .../TestLogAggregationService.java | 143 ++ .../nodemanager/webapp/TestNMWebServer.java | 5 +- .../webapp/TestNMWebServicesContainers.java | 39 +- .../server/resourcemanager/ResourceManager.java | 5 +- .../resourcemanager/rmnode/RMNodeImpl.java | 30 +- .../scheduler/capacity/CapacityScheduler.java | 16 + .../scheduler/fair/FairScheduler.java | 15 + .../scheduler/fifo/FifoScheduler.java | 16 + .../resourcemanager/TestRMNodeTransitions.java | 34 + .../capacity/TestCapacityScheduler.java | 89 +- .../scheduler/fair/TestFairScheduler.java | 1295 ++---------------- .../fair/TestFairSchedulerPreemption.java | 1295 +++++++++++++++++- .../scheduler/fifo/TestFifoScheduler.java | 107 +- .../src/site/markdown/YarnCommands.md | 3 + 123 files changed, 5646 insertions(+), 2450 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3bb9d5e8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java ----------------------------------------------------------------------
