You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2014/11/06 09:04:54 UTC
[43/43] git commit: Merge remote-tracking branch 'origin/trunk' into
HDFS-EC
Merge remote-tracking branch 'origin/trunk' into HDFS-EC
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4ce3a132
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4ce3a132
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4ce3a132
Branch: refs/heads/HDFS-EC
Commit: 4ce3a132e3a0fc0c7b9cd0017df758862c3e237e
Parents: 094cfd22 80d7d18
Author: Vinayakumar B <vi...@apache.org>
Authored: Thu Nov 6 13:29:04 2014 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Thu Nov 6 13:29:04 2014 +0530
----------------------------------------------------------------------
.gitignore | 1 +
BUILDING.txt | 13 -
.../hadoop-annotations/pom.xml | 15 +
.../server/AuthenticationFilter.java | 30 +-
.../server/AuthenticationHandler.java | 3 +
.../server/KerberosAuthenticationHandler.java | 2 +-
.../server/PseudoAuthenticationHandler.java | 9 +-
.../client/TestPseudoAuthenticator.java | 5 +-
.../server/TestAuthenticationFilter.java | 6 +-
.../server/TestPseudoAuthenticationHandler.java | 9 +-
hadoop-common-project/hadoop-common/CHANGES.txt | 64 ++-
hadoop-common-project/hadoop-common/pom.xml | 5 +
.../hadoop-common/src/main/bin/hadoop.cmd | 12 +-
.../crypto/key/kms/KMSClientProvider.java | 5 +-
.../org/apache/hadoop/http/HttpServer2.java | 3 +-
.../security/ssl/SslSocketConnectorSecure.java | 58 +++
.../ZKDelegationTokenSecretManager.java | 6 +-
.../DelegationTokenAuthenticationFilter.java | 22 +-
.../main/java/org/apache/hadoop/util/Shell.java | 4 +-
.../src/site/markdown/filesystem/testing.md | 47 ---
.../hadoop/fs/FileSystemContractBaseTest.java | 6 +-
.../fs/contract/AbstractContractDeleteTest.java | 27 ++
.../fs/contract/AbstractContractMkdirTest.java | 19 +
.../fs/contract/AbstractContractRenameTest.java | 41 ++
.../hadoop/fs/contract/ContractOptions.java | 7 +
.../hadoop/fs/contract/ContractTestUtils.java | 139 +++++++
.../java/org/apache/hadoop/io/TestUTF8.java | 23 +-
.../hadoop/security/TestSecurityUtil.java | 4 -
.../hadoop/security/ssl/KeyStoreTestUtil.java | 73 ++--
.../src/test/resources/contract/localfs.xml | 4 +
hadoop-common-project/hadoop-kms/pom.xml | 6 +
.../hadoop/crypto/key/kms/server/MiniKMS.java | 5 +-
.../hadoop/crypto/key/kms/server/TestKMS.java | 133 +++++-
hadoop-dist/pom.xml | 2 +-
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 6 +
.../org/apache/hadoop/test/TestJettyHelper.java | 3 +-
.../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 6 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 62 ++-
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 6 +
.../java/org/apache/hadoop/hdfs/DFSClient.java | 2 +-
.../org/apache/hadoop/hdfs/DFSInputStream.java | 7 +-
.../org/apache/hadoop/hdfs/DFSOutputStream.java | 2 +
.../sasl/SaslDataTransferServer.java | 5 +
.../qjournal/server/GetJournalEditServlet.java | 21 +-
.../hdfs/server/blockmanagement/BlockInfo.java | 4 +-
.../BlockInfoUnderConstruction.java | 8 +-
.../server/blockmanagement/BlockManager.java | 2 +-
.../hadoop/hdfs/server/common/Storage.java | 7 +-
.../namenode/EditLogFileOutputStream.java | 6 +-
.../hdfs/server/namenode/FSEditLogLoader.java | 4 +-
.../hdfs/server/namenode/FSNamesystem.java | 96 +++--
.../hdfs/server/namenode/ImageServlet.java | 18 +-
.../hdfs/server/namenode/NameNodeRpcServer.java | 6 +-
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 5 +-
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 2 +-
.../apache/hadoop/hdfs/TestRollingUpgrade.java | 8 +-
.../hadoop/hdfs/qjournal/TestNNWithQJM.java | 2 +-
.../hdfs/qjournal/TestSecureNNWithQJM.java | 216 ++++++++++
.../server/blockmanagement/TestBlockInfo.java | 6 +-
.../TestBlockInfoUnderConstruction.java | 2 +-
.../blockmanagement/TestBlockManager.java | 2 +-
.../blockmanagement/TestDatanodeDescriptor.java | 4 +-
.../blockmanagement/TestHeartbeatHandling.java | 6 +-
.../blockmanagement/TestReplicationPolicy.java | 4 +-
.../datanode/TestDataNodeVolumeFailure.java | 5 +
.../hdfs/server/namenode/TestAuditLogger.java | 95 +++++
.../hdfs/server/namenode/TestCheckpoint.java | 14 +-
.../TestCommitBlockSynchronization.java | 6 +-
hadoop-mapreduce-project/CHANGES.txt | 16 +
.../hadoop-mapreduce-client-jobclient/pom.xml | 6 +
.../hadoop/mapred/TestJavaSerialization.java | 34 +-
hadoop-project/pom.xml | 6 +
hadoop-tools/hadoop-aws/pom.xml | 7 +
.../org/apache/hadoop/fs/s3/S3Credentials.java | 4 +-
.../fs/s3a/BasicAWSCredentialsProvider.java | 8 +-
.../org/apache/hadoop/fs/s3a/Constants.java | 7 +-
.../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 147 ++++---
.../apache/hadoop/fs/s3a/S3AInputStream.java | 38 +-
.../apache/hadoop/fs/s3a/S3AOutputStream.java | 18 +-
.../site/markdown/tools/hadoop-aws/index.md | 417 +++++++++++++++++++
.../fs/contract/s3a/TestS3AContractRename.java | 13 +-
.../fs/s3/S3FileSystemContractBaseTest.java | 11 +-
.../fs/s3a/S3AFileSystemContractBaseTest.java | 327 ---------------
.../org/apache/hadoop/fs/s3a/S3ATestUtils.java | 51 +++
.../fs/s3a/TestS3AFileSystemContract.java | 105 +++++
.../hadoop/fs/s3a/scale/S3AScaleTestBase.java | 89 ++++
.../fs/s3a/scale/TestS3ADeleteManyFiles.java | 131 ++++++
.../NativeS3FileSystemContractBaseTest.java | 11 +-
.../TestJets3tNativeFileSystemStore.java | 3 +
.../src/test/resources/contract/s3a.xml | 5 +
.../hadoop-aws/src/test/resources/core-site.xml | 51 +++
hadoop-yarn-project/CHANGES.txt | 34 ++
.../api/records/timeline/TimelineEntity.java | 49 ++-
.../api/records/timeline/TimelineEvent.java | 17 +-
.../hadoop/yarn/client/TestRMFailover.java | 8 +-
.../records/timeline/TestTimelineRecords.java | 128 +++++-
.../pom.xml | 7 +
.../server/timeline/MemoryTimelineStore.java | 4 +
.../timeline/webapp/TimelineWebServices.java | 9 +-
.../TestApplicationHistoryServer.java | 77 ++--
.../server/timeline/TimelineStoreTestUtils.java | 4 +
.../server/resourcemanager/RMAppManager.java | 55 +--
.../resourcemanager/RMFatalEventType.java | 1 -
.../server/resourcemanager/ResourceManager.java | 60 ++-
.../resourcemanager/recovery/RMStateStore.java | 24 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 47 +++
.../rmapp/RMAppRecoverEvent.java | 36 ++
.../rmapp/attempt/RMAppAttemptImpl.java | 6 +-
.../scheduler/QueueNotFoundException.java | 32 ++
.../scheduler/capacity/CapacityScheduler.java | 7 +-
.../yarn/server/resourcemanager/TestRMHA.java | 62 +++
.../TestWorkPreservingRMRestart.java | 18 +-
.../rmapp/TestRMAppTransitions.java | 65 ++-
...tRMWebServicesHttpStaticUserPermissions.java | 195 +++++++++
114 files changed, 3023 insertions(+), 883 deletions(-)
----------------------------------------------------------------------