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 ae...@apache.org on 2016/06/19 00:33:18 UTC

[39/39] hadoop git commit: Merge branch 'trunk' into HDFS-1312

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/91d62aaf
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/91d62aaf
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/91d62aaf

Branch: refs/heads/HDFS-1312
Commit: 91d62aaf188a90fc02eeb35c6180f4097a2d1246
Parents: 13599a8 0319d73
Author: Anu Engineer <ae...@apache.org>
Authored: Sat Jun 18 17:32:11 2016 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Sat Jun 18 17:32:11 2016 -0700

----------------------------------------------------------------------
 .../crypto/key/kms/KMSClientProvider.java       |   2 -
 .../apache/hadoop/fs/CachingGetSpaceUsed.java   |  28 +-
 .../hadoop/fs/CommonConfigurationKeys.java      |   3 +
 .../src/main/java/org/apache/hadoop/fs/DU.java  |  10 +-
 .../java/org/apache/hadoop/fs/FileUtil.java     |  14 +
 .../java/org/apache/hadoop/fs/GetSpaceUsed.java |  25 ++
 .../apache/hadoop/fs/RawLocalFileSystem.java    |   5 -
 .../apache/hadoop/fs/WindowsGetSpaceUsed.java   |   9 +-
 .../java/org/apache/hadoop/fs/shell/Test.java   |  80 +++--
 .../org/apache/hadoop/ipc/CallQueueManager.java |   4 +-
 .../apache/hadoop/ipc/DecayRpcScheduler.java    |  17 +-
 .../org/apache/hadoop/ipc/FairCallQueue.java    |  19 +-
 .../hadoop/security/UserGroupInformation.java   |   2 +-
 .../web/DelegationTokenAuthenticator.java       |   3 +
 .../org/apache/hadoop/util/StringUtils.java     |  54 ++-
 .../src/main/resources/core-default.xml         |   1 +
 .../src/site/markdown/FileSystemShell.md        |   3 +
 .../test/java/org/apache/hadoop/fs/TestDU.java  |  10 +-
 .../org/apache/hadoop/fs/TestGetSpaceUsed.java  |   5 +-
 .../apache/hadoop/ipc/TestCallQueueManager.java |   4 +-
 .../hadoop/ipc/TestDecayRpcScheduler.java       |  30 +-
 .../apache/hadoop/ipc/TestFairCallQueue.java    |  27 +-
 .../hadoop/security/token/TestDtUtilShell.java  |   3 +-
 .../org/apache/hadoop/util/TestStringUtils.java |  44 ++-
 .../hadoop/crypto/key/kms/server/TestKMS.java   |  91 ++++-
 .../src/test/resources/log4j.properties         |   2 +-
 .../java/org/apache/hadoop/minikdc/MiniKdc.java |  11 +-
 .../hdfs/shortcircuit/TestShortCircuitShm.java  |   4 +-
 .../TestHttpFSFWithSWebhdfsFileSystem.java      |   5 +-
 .../TestHttpFSFileSystemLocalFileSystem.java    |   5 +-
 .../hdfs/nfs/nfs3/TestNfs3HttpServer.java       |   5 +-
 .../apache/hadoop/hdfs/HDFSPolicyProvider.java  |   6 +-
 .../BlockPlacementStatusWithUpgradeDomain.java  |   2 +-
 .../CacheReplicationMonitor.java                |   8 +
 .../server/namenode/FSImageFormatPBINode.java   |  10 +-
 .../OfflineImageReconstructor.java              |  30 +-
 .../src/main/webapps/hdfs/dfshealth.html        |   9 +
 .../src/main/webapps/hdfs/dfshealth.js          |  10 +
 .../src/site/markdown/HdfsRollingUpgrade.md     |   2 +-
 .../apache/hadoop/cli/TestCryptoAdminCLI.java   |   4 +-
 .../hadoop/fs/TestEnhancedByteBufferAccess.java |  12 +-
 .../TestSWebHdfsFileContextMainOperations.java  |   6 +-
 .../TestWebHdfsFileContextMainOperations.java   |   7 +-
 .../org/apache/hadoop/hdfs/MiniDFSCluster.java  |  17 +-
 .../hadoop/hdfs/TestAppendSnapshotTruncate.java |   4 +-
 .../org/apache/hadoop/hdfs/TestDFSShell.java    |  75 +++-
 .../hadoop/hdfs/TestDFSUpgradeFromImage.java    |  18 +-
 .../org/apache/hadoop/hdfs/TestDFSUtil.java     |   3 +-
 .../hadoop/hdfs/TestDatanodeLayoutUpgrade.java  |  21 +-
 ...estDatanodeStartupFixesLegacyStorageIDs.java |  12 +-
 .../org/apache/hadoop/hdfs/TestFetchImage.java  |   5 +-
 .../hadoop/hdfs/TestHDFSPolicyProvider.java     |  31 +-
 .../java/org/apache/hadoop/hdfs/TestPread.java  |   2 +-
 .../org/apache/hadoop/hdfs/TestSeekBug.java     |   3 +-
 .../sasl/SaslDataTransferTestCase.java          |   5 +-
 .../hdfs/qjournal/TestSecureNNWithQJM.java      |   5 +-
 .../hdfs/server/balancer/TestBalancer.java      |   3 +-
 ...stBlockPlacementStatusWithUpgradeDomain.java |  83 +++++
 .../hdfs/server/datanode/TestDataNodeUUID.java  |   3 +-
 .../hdfs/server/datanode/TestDataStorage.java   |   3 +-
 .../server/namenode/TestCreateEditsLog.java     |   6 +-
 .../namenode/TestDecommissioningStatus.java     |  65 +---
 .../namenode/TestEditLogFileInputStream.java    |   3 +-
 .../namenode/TestFSImageWithSnapshot.java       |   4 +-
 .../hadoop/hdfs/server/namenode/TestFsck.java   |  11 +-
 .../server/namenode/TestNameNodeHttpServer.java |   5 +-
 .../server/namenode/TestNameNodeRecovery.java   |   5 +-
 .../TestNameNodeRespectsBindHostKeys.java       |   5 +-
 .../TestUpgradeDomainBlockPlacementPolicy.java  | 161 +++++++--
 .../snapshot/TestRenameWithSnapshots.java       |   2 +-
 .../server/namenode/snapshot/TestSnapshot.java  |   4 +-
 .../apache/hadoop/hdfs/tools/TestGetConf.java   |  62 +---
 .../TestOfflineImageViewer.java                 |  19 ++
 .../hadoop/hdfs/util/HostsFileWriter.java       |  32 +-
 .../hdfs/util/TestCombinedHostsFileReader.java  |   5 +-
 .../hadoop/hdfs/web/TestHttpsFileSystem.java    |   5 +-
 .../hadoop/hdfs/web/TestWebHdfsTokens.java      |   9 +-
 .../java/org/apache/hadoop/test/PathUtils.java  |   7 +-
 .../HumanReadableHistoryViewerPrinter.java      |  15 +-
 .../hadoop-aws/dev-support/findbugs-exclude.xml |   7 +
 .../org/apache/hadoop/fs/s3/S3Credentials.java  |  31 +-
 .../org/apache/hadoop/fs/s3/S3FileSystem.java   |  20 +-
 .../org/apache/hadoop/fs/s3a/S3AFileSystem.java |  79 ++---
 .../java/org/apache/hadoop/fs/s3a/S3AUtils.java |  46 +++
 .../hadoop/fs/s3native/NativeS3FileSystem.java  |  19 +-
 .../hadoop/fs/s3native/S3xLoginHelper.java      | 283 +++++++++++++++
 .../src/site/markdown/tools/hadoop-aws/index.md | 313 ++++++++++++++++-
 .../apache/hadoop/fs/s3/TestS3FileSystem.java   |  24 +-
 .../hadoop/fs/s3a/TestS3AConfiguration.java     |  55 ++-
 .../hadoop/fs/s3a/TestS3ACredentialsInURL.java  | 153 +++++++++
 .../hadoop/fs/s3native/TestS3xLoginHelper.java  | 197 +++++++++++
 hadoop-tools/hadoop-azure-datalake/pom.xml      |   7 +-
 .../web/PrivateAzureDataLakeFileSystem.java     |   2 +-
 ...ClientCredentialBasedAccesTokenProvider.java | 155 +++++++++
 .../src/site/markdown/index.md                  |  64 ++++
 .../hadoop/fs/adl/TestADLResponseData.java      | 120 +++++++
 .../apache/hadoop/fs/adl/TestGetFileStatus.java |  65 ++++
 .../apache/hadoop/fs/adl/TestListStatus.java    |  95 ++++++
 .../hadoop/fs/adl/TestableAdlFileSystem.java    |  31 ++
 .../fs/adl/live/AdlStorageConfiguration.java    |  76 +++++
 .../hadoop/fs/adl/live/AdlStorageContract.java  |  65 ++++
 .../fs/adl/live/TestAdlContractAppendLive.java  |  53 +++
 .../fs/adl/live/TestAdlContractConcatLive.java  |  52 +++
 .../fs/adl/live/TestAdlContractCreateLive.java  |  52 +++
 .../fs/adl/live/TestAdlContractDeleteLive.java  |  44 +++
 .../fs/adl/live/TestAdlContractMkdirLive.java   |  55 +++
 .../fs/adl/live/TestAdlContractOpenLive.java    |  44 +++
 .../fs/adl/live/TestAdlContractRenameLive.java  |  63 ++++
 .../fs/adl/live/TestAdlContractRootDirLive.java |  52 +++
 .../fs/adl/live/TestAdlContractSeekLive.java    |  44 +++
 .../live/TestAdlDifferentSizeWritesLive.java    | 102 ++++++
 .../adl/live/TestAdlFileSystemContractLive.java | 111 ++++++
 .../hadoop/fs/adl/live/TestAdlReadLive.java     | 342 +++++++++++++++++++
 ...estAdlWebHdfsFileContextCreateMkdirLive.java |  79 +++++
 ...AdlWebHdfsFileContextMainOperationsLive.java | 104 ++++++
 ...hedRefreshTokenBasedAccessTokenProvider.java |   8 +-
 .../hadoop/fs/common/AdlMockWebServer.java      | 116 +++++++
 .../hadoop/fs/common/ExpectedResponse.java      |  72 ++++
 .../hadoop/fs/common/TestDataForRead.java       | 120 +++++++
 .../org/apache/hadoop/hdfs/web/TestAdlRead.java | 205 +++++++++++
 .../web/TestConcurrentDataReadOperations.java   | 306 +++++++++++++++++
 .../hdfs/web/TestConfigurationSetting.java      | 112 ++++++
 .../hdfs/web/TestSplitSizeCalculation.java      | 123 +++++++
 .../src/test/resources/adls.xml                 | 139 ++++++++
 .../test/resources/contract-test-options.xml    |  57 ++++
 .../apache/hadoop/yarn/client/cli/LogsCLI.java  |   7 +-
 .../hadoop/yarn/client/cli/TestLogsCLI.java     |  25 +-
 .../logaggregation/AggregatedLogFormat.java     |  74 ++--
 .../logaggregation/TestAggregatedLogFormat.java |   2 +-
 .../webapp/AHSWebServices.java                  |  11 +-
 .../logaggregation/AppLogAggregatorImpl.java    |   8 +-
 .../nodemanager/webapp/NMWebServices.java       |   9 +-
 .../TestLogAggregationService.java              | 102 +++++-
 .../scheduler/fair/FSLeafQueue.java             |  33 +-
 .../resourcemanager/scheduler/fair/FSQueue.java |  19 --
 .../scheduler/fair/SchedulingPolicy.java        |  11 -
 .../DominantResourceFairnessPolicy.java         |   5 -
 .../fair/policies/FairSharePolicy.java          |   5 -
 .../scheduler/fair/policies/FifoPolicy.java     |   5 -
 .../scheduler/fair/TestFairScheduler.java       |  82 ++++-
 140 files changed, 5481 insertions(+), 628 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/91d62aaf/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org