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 ar...@apache.org on 2014/09/12 20:47:24 UTC
[41/41] git commit: Merge branch 'trunk' into HDFS-6581
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/7aeda47b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7aeda47b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7aeda47b
Branch: refs/heads/HDFS-6581
Commit: 7aeda47bd94fa9570dcd861ecb45c3aa9d0161e0
Parents: de20cf2 3122daa
Author: arp <ar...@apache.org>
Authored: Fri Sep 12 11:45:11 2014 -0700
Committer: arp <ar...@apache.org>
Committed: Fri Sep 12 11:45:11 2014 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 31 +-
.../java/org/apache/hadoop/fs/s3/Block.java | 52 --
.../apache/hadoop/fs/s3/FileSystemStore.java | 67 --
.../java/org/apache/hadoop/fs/s3/INode.java | 128 ---
.../hadoop/fs/s3/Jets3tFileSystemStore.java | 445 -----------
.../org/apache/hadoop/fs/s3/MigrationTool.java | 291 -------
.../org/apache/hadoop/fs/s3/S3Credentials.java | 103 ---
.../org/apache/hadoop/fs/s3/S3Exception.java | 39 -
.../org/apache/hadoop/fs/s3/S3FileSystem.java | 486 -----------
.../hadoop/fs/s3/S3FileSystemConfigKeys.java | 47 --
.../hadoop/fs/s3/S3FileSystemException.java | 36 -
.../org/apache/hadoop/fs/s3/S3InputStream.java | 215 -----
.../org/apache/hadoop/fs/s3/S3OutputStream.java | 235 ------
.../hadoop/fs/s3/VersionMismatchException.java | 37 -
.../java/org/apache/hadoop/fs/s3/package.html | 55 --
.../apache/hadoop/fs/s3native/FileMetadata.java | 59 --
.../s3native/Jets3tNativeFileSystemStore.java | 483 -----------
.../fs/s3native/NativeFileSystemStore.java | 67 --
.../hadoop/fs/s3native/NativeS3FileSystem.java | 796 -------------------
.../hadoop/fs/s3native/PartialListing.java | 64 --
.../s3native/S3NativeFileSystemConfigKeys.java | 47 --
.../org/apache/hadoop/fs/s3native/package.html | 32 -
.../authorize/DefaultImpersonationProvider.java | 2 +-
.../DelegationTokenAuthenticationFilter.java | 3 +-
.../hadoop/util/GenericOptionsParser.java | 2 +-
.../hadoop/util/NativeLibraryChecker.java | 22 +-
.../java/org/apache/hadoop/util/Progress.java | 10 +-
.../services/org.apache.hadoop.fs.FileSystem | 2 -
.../fs/contract/s3n/NativeS3Contract.java | 43 -
.../fs/contract/s3n/TestS3NContractCreate.java | 38 -
.../fs/contract/s3n/TestS3NContractDelete.java | 31 -
.../fs/contract/s3n/TestS3NContractMkdir.java | 34 -
.../fs/contract/s3n/TestS3NContractOpen.java | 31 -
.../fs/contract/s3n/TestS3NContractRename.java | 32 -
.../fs/contract/s3n/TestS3NContractRootDir.java | 35 -
.../fs/contract/s3n/TestS3NContractSeek.java | 31 -
.../hadoop/fs/s3/InMemoryFileSystemStore.java | 200 -----
.../fs/s3/Jets3tS3FileSystemContractTest.java | 31 -
.../fs/s3/S3FileSystemContractBaseTest.java | 63 --
.../hadoop/fs/s3/S3InMemoryFileSystem.java | 32 -
.../java/org/apache/hadoop/fs/s3/TestINode.java | 60 --
.../fs/s3/TestInMemoryS3FileSystemContract.java | 31 -
.../apache/hadoop/fs/s3/TestS3Credentials.java | 36 -
.../apache/hadoop/fs/s3/TestS3FileSystem.java | 50 --
.../hadoop/fs/s3/TestS3InMemoryFileSystem.java | 67 --
.../s3native/InMemoryNativeFileSystemStore.java | 206 -----
.../Jets3tNativeS3FileSystemContractTest.java | 30 -
.../NativeS3FileSystemContractBaseTest.java | 233 ------
.../fs/s3native/S3NInMemoryFileSystem.java | 32 -
.../TestInMemoryNativeS3FileSystemContract.java | 30 -
.../TestJets3tNativeFileSystemStore.java | 126 ---
.../fs/s3native/TestS3NInMemoryFileSystem.java | 69 --
.../security/authorize/TestProxyUsers.java | 15 +
.../delegation/web/TestWebDelegationToken.java | 17 +
.../hadoop/util/TestGenericOptionsParser.java | 2 +-
.../hadoop/util/TestNativeLibraryChecker.java | 29 +
.../src/test/resources/contract/s3n.xml | 95 ---
.../hadoop-kms/src/main/conf/kms-acls.xml | 38 +
.../hadoop/crypto/key/kms/server/KMSACLs.java | 97 ++-
.../crypto/key/kms/server/KMSConfiguration.java | 9 +
.../hadoop/crypto/key/kms/server/KMSWebApp.java | 17 +-
.../kms/server/KeyAuthorizationKeyProvider.java | 276 +++++++
.../hadoop-kms/src/site/apt/index.apt.vm | 106 +++
.../hadoop/crypto/key/kms/server/TestKMS.java | 236 +++++-
.../server/TestKeyAuthorizationKeyProvider.java | 218 +++++
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 20 +-
.../hadoop/hdfs/qjournal/server/Journal.java | 8 +-
.../DelegationTokenSecretManager.java | 3 +-
.../hadoop/hdfs/server/balancer/Dispatcher.java | 2 +
.../hdfs/server/namenode/FSNamesystem.java | 2 +-
.../web/resources/NamenodeWebHdfsMethods.java | 3 +
.../hadoop/hdfs/util/BestEffortLongFile.java | 1 +
.../hadoop/hdfs/web/WebHdfsFileSystem.java | 18 +-
.../org/apache/hadoop/hdfs/DFSTestUtil.java | 20 +-
.../apache/hadoop/hdfs/TestEncryptionZones.java | 187 +++++
.../hadoop/hdfs/TestEncryptionZonesWithHA.java | 121 +++
.../java/org/apache/hadoop/hdfs/TestRead.java | 22 +
.../datanode/TestDataNodeRollingUpgrade.java | 6 +-
.../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 41 +
hadoop-mapreduce-project/CHANGES.txt | 8 +-
.../CheckpointAMPreemptionPolicy.java | 2 +-
.../src/main/resources/mapred-default.xml | 7 +-
...istoryServerFileSystemStateStoreService.java | 6 +
hadoop-project/pom.xml | 12 +
.../hadoop-aws/dev-support/findbugs-exclude.xml | 358 ++++++++-
.../java/org/apache/hadoop/fs/s3/Block.java | 52 ++
.../apache/hadoop/fs/s3/FileSystemStore.java | 67 ++
.../java/org/apache/hadoop/fs/s3/INode.java | 128 +++
.../hadoop/fs/s3/Jets3tFileSystemStore.java | 445 +++++++++++
.../org/apache/hadoop/fs/s3/MigrationTool.java | 291 +++++++
.../org/apache/hadoop/fs/s3/S3Credentials.java | 103 +++
.../org/apache/hadoop/fs/s3/S3Exception.java | 39 +
.../org/apache/hadoop/fs/s3/S3FileSystem.java | 486 +++++++++++
.../hadoop/fs/s3/S3FileSystemConfigKeys.java | 47 ++
.../hadoop/fs/s3/S3FileSystemException.java | 36 +
.../org/apache/hadoop/fs/s3/S3InputStream.java | 215 +++++
.../org/apache/hadoop/fs/s3/S3OutputStream.java | 235 ++++++
.../hadoop/fs/s3/VersionMismatchException.java | 37 +
.../java/org/apache/hadoop/fs/s3/package.html | 55 ++
.../apache/hadoop/fs/s3native/FileMetadata.java | 59 ++
.../s3native/Jets3tNativeFileSystemStore.java | 483 +++++++++++
.../fs/s3native/NativeFileSystemStore.java | 67 ++
.../hadoop/fs/s3native/NativeS3FileSystem.java | 796 +++++++++++++++++++
.../hadoop/fs/s3native/PartialListing.java | 64 ++
.../s3native/S3NativeFileSystemConfigKeys.java | 47 ++
.../org/apache/hadoop/fs/s3native/package.html | 32 +
.../services/org.apache.hadoop.fs.FileSystem | 17 +
.../fs/contract/s3n/NativeS3Contract.java | 43 +
.../fs/contract/s3n/TestS3NContractCreate.java | 38 +
.../fs/contract/s3n/TestS3NContractDelete.java | 31 +
.../fs/contract/s3n/TestS3NContractMkdir.java | 34 +
.../fs/contract/s3n/TestS3NContractOpen.java | 31 +
.../fs/contract/s3n/TestS3NContractRename.java | 32 +
.../fs/contract/s3n/TestS3NContractRootDir.java | 35 +
.../fs/contract/s3n/TestS3NContractSeek.java | 31 +
.../hadoop/fs/s3/InMemoryFileSystemStore.java | 200 +++++
.../fs/s3/Jets3tS3FileSystemContractTest.java | 31 +
.../fs/s3/S3FileSystemContractBaseTest.java | 54 ++
.../hadoop/fs/s3/S3InMemoryFileSystem.java | 32 +
.../java/org/apache/hadoop/fs/s3/TestINode.java | 60 ++
.../fs/s3/TestInMemoryS3FileSystemContract.java | 31 +
.../apache/hadoop/fs/s3/TestS3Credentials.java | 36 +
.../apache/hadoop/fs/s3/TestS3FileSystem.java | 50 ++
.../hadoop/fs/s3/TestS3InMemoryFileSystem.java | 67 ++
.../s3native/InMemoryNativeFileSystemStore.java | 206 +++++
.../Jets3tNativeS3FileSystemContractTest.java | 30 +
.../NativeS3FileSystemContractBaseTest.java | 233 ++++++
.../fs/s3native/S3NInMemoryFileSystem.java | 32 +
.../TestInMemoryNativeS3FileSystemContract.java | 30 +
.../TestJets3tNativeFileSystemStore.java | 126 +++
.../fs/s3native/TestS3NInMemoryFileSystem.java | 69 ++
.../src/test/resources/contract/s3n.xml | 95 +++
hadoop-tools/hadoop-tools-dist/pom.xml | 6 +
hadoop-yarn-project/CHANGES.txt | 37 +-
.../RegisterApplicationMasterResponse.java | 23 +
.../api/records/ApplicationAttemptReport.java | 18 +-
.../records/ApplicationResourceUsageReport.java | 41 +-
.../hadoop/yarn/api/records/ContainerId.java | 48 +-
.../hadoop/yarn/conf/YarnConfiguration.java | 19 +
.../src/main/proto/yarn_protos.proto | 5 +-
.../src/main/proto/yarn_service_protos.proto | 6 +
.../hadoop/yarn/client/cli/ApplicationCLI.java | 6 +
.../hadoop/yarn/client/ProtocolHATestBase.java | 2 +-
.../yarn/client/api/impl/TestAHSClient.java | 2 +
.../yarn/client/api/impl/TestYarnClient.java | 2 +
.../hadoop/yarn/client/cli/TestYarnCLI.java | 14 +-
...RegisterApplicationMasterResponsePBImpl.java | 78 +-
.../impl/pb/ApplicationAttemptReportPBImpl.java | 19 +
.../ApplicationResourceUsageReportPBImpl.java | 24 +
.../api/records/impl/pb/ContainerIdPBImpl.java | 8 +-
.../hadoop/yarn/webapp/view/HtmlBlock.java | 12 +
.../src/main/resources/yarn-default.xml | 70 +-
.../apache/hadoop/yarn/api/TestContainerId.java | 24 +-
.../hadoop/yarn/util/TestConverterUtils.java | 17 +-
.../ApplicationHistoryManagerImpl.java | 2 +-
...pplicationHistoryManagerOnTimelineStore.java | 511 ++++++++++++
.../ApplicationHistoryServer.java | 11 +-
.../FileSystemApplicationHistoryStore.java | 3 +-
.../server/timeline/MemoryTimelineStore.java | 10 +-
.../TestApplicationHistoryClientService.java | 1 +
...pplicationHistoryManagerOnTimelineStore.java | 317 ++++++++
.../yarn/server/api/ApplicationContext.java | 43 +-
.../metrics/AppAttemptMetricsConstants.java | 64 ++
.../metrics/ApplicationMetricsConstants.java | 64 ++
.../metrics/ContainerMetricsConstants.java | 60 ++
.../hadoop/yarn/server/utils/BuilderUtils.java | 9 +-
.../yarn/server/webapp/AppAttemptBlock.java | 41 +-
.../hadoop/yarn/server/webapp/AppBlock.java | 51 +-
.../hadoop/yarn/server/webapp/AppsBlock.java | 20 +-
.../yarn/server/webapp/ContainerBlock.java | 19 +-
.../hadoop/yarn/server/webapp/WebServices.java | 113 ++-
.../yarn/server/webapp/dao/AppAttemptInfo.java | 6 +
.../hadoop/yarn/server/webapp/dao/AppInfo.java | 17 -
.../util/CgroupsLCEResourcesHandler.java | 94 ++-
.../util/NodeManagerHardwareUtils.java | 79 ++
.../util/TestCgroupsLCEResourcesHandler.java | 147 +++-
.../util/TestNodeManagerHardwareUtils.java | 72 ++
.../ApplicationMasterService.java | 12 +-
.../server/resourcemanager/RMAppManager.java | 2 +-
.../yarn/server/resourcemanager/RMContext.java | 7 +-
.../server/resourcemanager/RMContextImpl.java | 19 +-
.../server/resourcemanager/RMServerUtils.java | 2 +-
.../server/resourcemanager/ResourceManager.java | 9 +
.../ahs/RMApplicationHistoryWriter.java | 18 +-
.../metrics/AppAttemptFinishedEvent.java | 82 ++
.../metrics/AppAttemptRegisteredEvent.java | 81 ++
.../metrics/ApplicationCreatedEvent.java | 78 ++
.../metrics/ApplicationFinishedEvent.java | 75 ++
.../metrics/ContainerCreatedEvent.java | 67 ++
.../metrics/ContainerFinishedEvent.java | 65 ++
.../metrics/SystemMetricsEvent.java | 33 +
.../metrics/SystemMetricsEventType.java | 34 +
.../metrics/SystemMetricsPublisher.java | 490 ++++++++++++
.../ProportionalCapacityPreemptionPolicy.java | 3 +-
.../recovery/FileSystemRMStateStore.java | 38 +-
.../recovery/MemoryRMStateStore.java | 15 +-
.../recovery/NullRMStateStore.java | 4 +-
.../resourcemanager/recovery/RMStateStore.java | 26 +-
.../recovery/ZKRMStateStore.java | 8 +-
.../records/ApplicationAttemptStateData.java | 32 +-
.../resourcemanager/recovery/records/Epoch.java | 11 +-
.../pb/ApplicationAttemptStateDataPBImpl.java | 24 +
.../recovery/records/impl/pb/EpochPBImpl.java | 6 +-
.../server/resourcemanager/rmapp/RMApp.java | 6 +
.../server/resourcemanager/rmapp/RMAppImpl.java | 40 +-
.../resourcemanager/rmapp/RMAppMetrics.java | 15 +-
.../attempt/AggregateAppResourceUsage.java | 60 ++
.../rmapp/attempt/RMAppAttemptImpl.java | 25 +-
.../rmapp/attempt/RMAppAttemptMetrics.java | 36 +-
.../rmcontainer/RMContainerImpl.java | 30 +-
.../scheduler/AbstractYarnScheduler.java | 15 +-
.../scheduler/AppSchedulingInfo.java | 14 +-
.../scheduler/SchedulerApplicationAttempt.java | 43 +-
.../scheduler/YarnScheduler.java | 10 +
.../scheduler/capacity/CapacityScheduler.java | 22 +-
.../scheduler/common/fica/FiCaSchedulerApp.java | 3 +
.../scheduler/fair/FSAppAttempt.java | 3 +
.../scheduler/fair/FairScheduler.java | 16 +-
.../fair/policies/ComputeFairShares.java | 94 ++-
.../server/resourcemanager/webapp/AppBlock.java | 5 +-
.../resourcemanager/webapp/dao/AppInfo.java | 12 +
.../yarn_server_resourcemanager_recovery.proto | 4 +-
.../server/resourcemanager/TestAppManager.java | 3 +
.../TestApplicationMasterService.java | 53 +-
.../resourcemanager/TestClientRMService.java | 63 +-
.../TestContainerResourceUsage.java | 401 ++++++++++
.../server/resourcemanager/TestRMRestart.java | 50 ++
.../TestWorkPreservingRMRestart.java | 2 +-
.../applicationsmanager/MockAsm.java | 23 +-
.../metrics/TestSystemMetricsPublisher.java | 355 +++++++++
.../recovery/RMStateStoreTestBase.java | 24 +-
.../server/resourcemanager/rmapp/MockRMApp.java | 10 +
.../rmapp/TestRMAppTransitions.java | 47 +-
.../attempt/TestRMAppAttemptTransitions.java | 82 +-
.../rmcontainer/TestRMContainerImpl.java | 22 +
.../TestSchedulerApplicationAttempt.java | 4 +-
.../scheduler/capacity/TestChildQueueOrder.java | 3 +
.../scheduler/capacity/TestLeafQueue.java | 89 ++-
.../scheduler/capacity/TestUtils.java | 6 +-
.../scheduler/fair/FairSchedulerTestBase.java | 4 +-
.../scheduler/fair/TestFairScheduler.java | 193 ++++-
.../fair/TestMaxRunningAppsEnforcer.java | 2 +-
.../scheduler/fifo/TestFifoScheduler.java | 7 +
.../webapp/TestRMWebAppFairScheduler.java | 2 +-
.../webapp/TestRMWebServicesApps.java | 2 +-
.../TestRMWebServicesAppsModification.java | 50 +-
.../src/site/apt/ResourceManagerRest.apt.vm | 28 +-
247 files changed, 12416 insertions(+), 5925 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7aeda47b/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/7aeda47b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
----------------------------------------------------------------------