hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [26/50] git commit: Merge branch 'trunk' into HDFS-6584
Date Fri, 19 Sep 2014 05:28:28 GMT
Merge branch 'trunk' into HDFS-6584


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/70dfe9cf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/70dfe9cf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/70dfe9cf

Branch: refs/heads/HDFS-6581
Commit: 70dfe9cfab73fc1ff0ed4dd37027a77b19ac3104
Parents: db41a1b 4be9517
Author: Tsz-Wo Nicholas Sze <szetszwo@hortonworks.com>
Authored: Thu Sep 11 15:23:38 2014 +0800
Committer: Tsz-Wo Nicholas Sze <szetszwo@hortonworks.com>
Committed: Thu Sep 11 15:23:38 2014 +0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |   7 +
 .../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 +-
 .../hadoop/util/GenericOptionsParser.java       |   2 +-
 .../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 +
 .../hadoop/util/TestGenericOptionsParser.java   |   2 +-
 .../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     |   3 +
 .../DelegationTokenSecretManager.java           |   3 +-
 .../web/resources/NamenodeWebHdfsMethods.java   |   3 +
 .../hadoop/hdfs/web/WebHdfsFileSystem.java      |  18 +-
 .../org/apache/hadoop/hdfs/web/TestWebHDFS.java |  41 +
 hadoop-mapreduce-project/CHANGES.txt            |   3 +
 ...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                 |  18 +
 .../RegisterApplicationMasterResponse.java      |  23 +
 .../records/ApplicationResourceUsageReport.java |  41 +-
 .../hadoop/yarn/conf/YarnConfiguration.java     |   6 +
 .../src/main/proto/yarn_protos.proto            |   2 +
 .../src/main/proto/yarn_service_protos.proto    |   6 +
 .../hadoop/yarn/client/cli/ApplicationCLI.java  |   6 +
 .../hadoop/yarn/client/cli/TestYarnCLI.java     |   8 +-
 ...RegisterApplicationMasterResponsePBImpl.java |  78 +-
 .../ApplicationResourceUsageReportPBImpl.java   |  24 +
 .../src/main/resources/yarn-default.xml         |  16 +-
 .../hadoop/yarn/server/utils/BuilderUtils.java  |   5 +-
 .../util/CgroupsLCEResourcesHandler.java        |  94 ++-
 .../util/NodeManagerHardwareUtils.java          |  79 ++
 .../util/TestCgroupsLCEResourcesHandler.java    | 147 +++-
 .../util/TestNodeManagerHardwareUtils.java      |  72 ++
 .../ApplicationMasterService.java               |  10 +-
 .../server/resourcemanager/RMAppManager.java    |   2 +-
 .../server/resourcemanager/RMServerUtils.java   |   2 +-
 .../recovery/FileSystemRMStateStore.java        |   4 +-
 .../recovery/MemoryRMStateStore.java            |   9 +-
 .../resourcemanager/recovery/RMStateStore.java  |  24 +-
 .../recovery/ZKRMStateStore.java                |   4 +-
 .../records/ApplicationAttemptStateData.java    |  32 +-
 .../pb/ApplicationAttemptStateDataPBImpl.java   |  24 +
 .../server/resourcemanager/rmapp/RMAppImpl.java |  23 +-
 .../resourcemanager/rmapp/RMAppMetrics.java     |  15 +-
 .../attempt/AggregateAppResourceUsage.java      |  60 ++
 .../rmapp/attempt/RMAppAttemptImpl.java         |  16 +-
 .../rmapp/attempt/RMAppAttemptMetrics.java      |  36 +-
 .../rmcontainer/RMContainerImpl.java            |  26 +-
 .../scheduler/AbstractYarnScheduler.java        |  15 +-
 .../scheduler/SchedulerApplicationAttempt.java  |  41 +-
 .../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        |  87 +-
 .../server/resourcemanager/webapp/AppBlock.java |   5 +-
 .../resourcemanager/webapp/dao/AppInfo.java     |  12 +
 .../yarn_server_resourcemanager_recovery.proto  |   4 +-
 .../TestApplicationMasterService.java           |  53 +-
 .../resourcemanager/TestClientRMService.java    |  60 +-
 .../TestContainerResourceUsage.java             | 401 ++++++++++
 .../server/resourcemanager/TestRMRestart.java   |  50 ++
 .../applicationsmanager/MockAsm.java            |  19 +-
 .../recovery/RMStateStoreTestBase.java          |  18 +-
 .../rmapp/TestRMAppTransitions.java             |  36 +-
 .../attempt/TestRMAppAttemptTransitions.java    |  72 +-
 .../rmcontainer/TestRMContainerImpl.java        |  11 +
 .../scheduler/capacity/TestLeafQueue.java       |  89 ++-
 .../scheduler/fair/FairSchedulerTestBase.java   |   4 +-
 .../scheduler/fair/TestFairScheduler.java       | 145 +++-
 .../webapp/TestRMWebAppFairScheduler.java       |   2 +-
 .../webapp/TestRMWebServicesApps.java           |   2 +-
 .../TestRMWebServicesAppsModification.java      |  50 +-
 .../src/site/apt/ResourceManagerRest.apt.vm     |  22 +-
 175 files changed, 8886 insertions(+), 5666 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/70dfe9cf/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/70dfe9cf/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
----------------------------------------------------------------------


Mime
View raw message