[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HADOOP-13345

2017-08-31 Thread stevel 
Merge branch 'trunk' into HADOOP-13345


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

Branch: refs/heads/HADOOP-13345
Commit: 11e5f54fee519980dcd82211125b15cb9bfeb0e4
Parents: 845cd36 f9e0cc8
Author: Steve Loughran 
Authored: Thu Aug 31 16:56:02 2017 +0100
Committer: Steve Loughran 
Committed: Thu Aug 31 16:56:02 2017 +0100

--
 BUILDING.txt|4 +-
 dev-support/docker/Dockerfile   |   17 +-
 .../authentication/client/AuthenticatedURL.java |  184 +-
 .../client/KerberosAuthenticator.java   |   30 +-
 .../client/PseudoAuthenticator.java |5 +-
 .../hadoop-common/HadoopCommon.cmake|   26 +-
 .../hadoop-common/src/CMakeLists.txt|2 +-
 .../src/main/conf/hadoop-policy.xml |   11 +
 .../org/apache/hadoop/conf/Configuration.java   |   71 +-
 .../crypto/key/KeyProviderCryptoExtension.java  |  147 +-
 .../crypto/key/kms/KMSClientProvider.java   |  158 +-
 .../hadoop/crypto/key/kms/KMSRESTConstants.java |1 +
 .../key/kms/LoadBalancingKMSClientProvider.java |   20 +
 .../hadoop/fs/FSDataOutputStreamBuilder.java|   74 +-
 .../org/apache/hadoop/fs/FsServerDefaults.java  |9 +
 .../org/apache/hadoop/fs/LocatedFileStatus.java |6 +-
 .../hadoop/fs/permission/FsPermission.java  |2 +-
 .../apache/hadoop/fs/sftp/SFTPFileSystem.java   |6 +
 .../org/apache/hadoop/fs/shell/AclCommands.java |6 +-
 .../hadoop/fs/shell/CommandWithDestination.java |4 +-
 .../java/org/apache/hadoop/fs/shell/Ls.java |4 +-
 .../org/apache/hadoop/http/HttpServer2.java |9 +-
 .../hadoop/io/erasurecode/CodecRegistry.java|2 +-
 .../io/erasurecode/ErasureCodeConstants.java|8 +
 .../apache/hadoop/ipc/ProtobufRpcEngine.java|   14 +-
 .../java/org/apache/hadoop/util/KMSUtil.java|  134 ++
 .../hadoop/util/curator/ZKCuratorManager.java   |  142 +-
 .../bzip2/org_apache_hadoop_io_compress_bzip2.h |2 +
 .../src/main/resources/core-default.xml |   10 +-
 .../hadoop-common/src/site/markdown/Metrics.md  |   24 +-
 .../src/site/markdown/filesystem/filesystem.md  |   33 +-
 .../filesystem/fsdataoutputstreambuilder.md |  182 ++
 .../src/site/markdown/filesystem/index.md   |1 +
 .../conf/TestCommonConfigurationFields.java |1 +
 .../apache/hadoop/conf/TestConfiguration.java   |  390 ++--
 .../hadoop/conf/TestConfigurationSubclass.java  |8 +-
 .../apache/hadoop/conf/TestDeprecatedKeys.java  |8 +-
 .../apache/hadoop/conf/TestGetInstances.java|8 +-
 .../key/TestKeyProviderCryptoExtension.java |  113 +-
 .../org/apache/hadoop/fs/TestAvroFSInput.java   |6 +-
 .../test/java/org/apache/hadoop/fs/TestDU.java  |   19 +-
 .../java/org/apache/hadoop/fs/TestFilterFs.java |8 +-
 .../hadoop/fs/TestGetFileBlockLocations.java|   25 +-
 .../org/apache/hadoop/fs/TestGlobExpander.java  |7 +-
 .../apache/hadoop/fs/TestLocatedFileStatus.java |   52 +
 .../java/org/apache/hadoop/fs/TestTrash.java|   24 +-
 .../apache/hadoop/fs/TestTruncatedInputBug.java |6 +-
 .../hadoop/fs/permission/TestFsPermission.java  |   14 +-
 .../org/apache/hadoop/http/TestHttpServer.java  |   13 +
 .../hadoop/http/TestHttpServerWithSpengo.java   |  242 ++-
 .../apache/hadoop/ipc/TestFairCallQueue.java|   33 +-
 .../org/apache/hadoop/log/TestLog4Json.java |6 +-
 .../hadoop/net/TestScriptBasedMapping.java  |9 +-
 .../TestScriptBasedMappingWithDependency.java   |7 +-
 .../security/TestAuthenticationFilter.java  |6 +-
 .../TestAuthenticationWithProxyUserFilter.java  |7 +-
 .../security/TestWhitelistBasedResolver.java|9 +-
 .../apache/hadoop/security/token/TestToken.java |   12 +-
 .../hadoop/util/TestAsyncDiskService.java   |6 +-
 .../apache/hadoop/util/TestCacheableIPList.java |   13 +-
 .../apache/hadoop/util/TestFileBasedIPList.java |   12 +-
 .../org/apache/hadoop/util/TestFindClass.java   |2 +-
 .../apache/hadoop/util/TestGenericsUtil.java|   12 +-
 .../org/apache/hadoop/util/TestIndexedSort.java |7 +-
 .../hadoop/util/TestNativeLibraryChecker.java   |8 +-
 .../util/curator/TestZKCuratorManager.java  |   41 +-
 ...rKeyGeneratorKeyProviderCryptoExtension.java |6 +
 .../hadoop/crypto/key/kms/server/KMS.java   |  113 +-
 .../crypto/key/kms/server/KMSJSONReader.java|8 +-
 .../key/kms/server/KMSServerJSONUtils.java  |   34 +-
 .../hadoop/crypto/key/kms/server/KMSWebApp.java |   18 +
 .../kms/server/KeyAuthorizationKeyProvider.java |   19 +
 .../hadoop-kms/src/site/markdown/index.md.vm|   60 +-
 .../hadoop/crypto/key/kms/server/TestKMS.java

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HADOOP-13345

2017-06-06 Thread liuml07 
Merge branch 'trunk' into HADOOP-13345


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

Branch: refs/heads/HADOOP-13345
Commit: 5f02de2e029fd739c8504740467b838d1d336e40
Parents: 2d06842 6aeda55
Author: Mingliang Liu 
Authored: Mon Jun 5 13:10:05 2017 -0700
Committer: Mingliang Liu 
Committed: Mon Jun 5 13:30:29 2017 -0700

--
 BUILDING.txt|2 -
 LICENSE.txt |   47 +-
 dev-support/docker/Dockerfile   |2 +
 hadoop-assemblies/pom.xml   |4 +-
 .../resources/assemblies/hadoop-yarn-dist.xml   |5 +-
 hadoop-build-tools/pom.xml  |   12 +-
 .../main/resources/checkstyle/checkstyle.xml|4 +-
 hadoop-client-modules/hadoop-client-api/pom.xml |4 +-
 .../hadoop-client-check-invariants/pom.xml  |4 +-
 .../hadoop-client-check-test-invariants/pom.xml |4 +-
 .../hadoop-client-integration-tests/pom.xml |4 +-
 .../hadoop-client-minicluster/pom.xml   |8 +-
 .../hadoop-client-runtime/pom.xml   |5 +-
 hadoop-client-modules/hadoop-client/pom.xml |4 +-
 hadoop-client-modules/pom.xml   |2 +-
 .../hadoop-cloud-storage/pom.xml|4 +-
 hadoop-cloud-storage-project/pom.xml|4 +-
 .../hadoop-annotations/pom.xml  |4 +-
 .../hadoop-auth-examples/pom.xml|4 +-
 hadoop-common-project/hadoop-auth/pom.xml   |   19 +-
 .../authentication/util/KerberosName.java   |5 +-
 .../authentication/util/TestKerberosName.java   |4 +-
 hadoop-common-project/hadoop-common/pom.xml |9 +-
 .../src/main/bin/hadoop-functions.sh|   24 -
 .../src/main/conf/log4j.properties  |   37 +-
 .../org/apache/hadoop/conf/ConfigRedactor.java  |5 +-
 .../org/apache/hadoop/conf/Configuration.java   |   37 +-
 .../hadoop/crypto/CryptoOutputStream.java   |4 +-
 .../org/apache/hadoop/crypto/OpensslCipher.java |4 +-
 .../hadoop/crypto/key/kms/ValueQueue.java   |2 +-
 .../org/apache/hadoop/fs/BlockLocation.java |   21 +-
 .../apache/hadoop/fs/CachingGetSpaceUsed.java   |3 +
 .../fs/CommonConfigurationKeysPublic.java   |   17 +-
 .../java/org/apache/hadoop/fs/CreateFlag.java   |8 +-
 .../src/main/java/org/apache/hadoop/fs/DU.java  |3 +-
 .../apache/hadoop/fs/FSDataOutputStream.java|   10 +-
 .../hadoop/fs/FSDataOutputStreamBuilder.java|8 +-
 .../java/org/apache/hadoop/fs/FileSystem.java   |8 +-
 .../java/org/apache/hadoop/fs/FileUtil.java |5 +-
 .../org/apache/hadoop/fs/FilterFileSystem.java  |2 +-
 .../java/org/apache/hadoop/fs/FilterFs.java |4 +-
 .../main/java/org/apache/hadoop/fs/Options.java |2 +-
 .../apache/hadoop/fs/RawLocalFileSystem.java|2 +-
 .../apache/hadoop/fs/StreamCapabilities.java|   67 +
 .../hadoop/fs/http/AbstractHttpFileSystem.java  |  153 +
 .../apache/hadoop/fs/http/HttpFileSystem.java   |   28 +
 .../apache/hadoop/fs/http/HttpsFileSystem.java  |   28 +
 .../org/apache/hadoop/fs/http/package-info.java |   23 +
 .../apache/hadoop/fs/sftp/SFTPFileSystem.java   |2 +-
 .../hadoop/fs/shell/CommandWithDestination.java |2 +-
 .../org/apache/hadoop/fs/shell/FsUsage.java |   14 +-
 .../apache/hadoop/fs/shell/XAttrCommands.java   |7 +-
 .../hadoop/fs/viewfs/ChRootedFileSystem.java|2 +-
 .../org/apache/hadoop/fs/viewfs/ChRootedFs.java |2 +-
 .../apache/hadoop/fs/viewfs/ViewFileSystem.java |8 +-
 .../apache/hadoop/ha/ActiveStandbyElector.java  |4 +-
 .../org/apache/hadoop/ha/HAServiceProtocol.java |2 +-
 .../java/org/apache/hadoop/ha/NodeFencer.java   |3 +-
 .../org/apache/hadoop/ha/PowerShellFencer.java  |  154 +
 .../org/apache/hadoop/http/HttpServer2.java |   48 +-
 .../main/java/org/apache/hadoop/io/IOUtils.java |   55 +-
 .../java/org/apache/hadoop/io/SequenceFile.java |2 +-
 .../apache/hadoop/io/compress/BZip2Codec.java   |   20 +-
 .../apache/hadoop/io/compress/CodecPool.java|   10 +-
 .../io/compress/CompressionInputStream.java |   11 +-
 .../io/compress/CompressionOutputStream.java|   16 +-
 .../hadoop/io/compress/CompressorStream.java|3 +-
 .../hadoop/io/compress/DecompressorStream.java  |7 +-
 .../compress/zlib/BuiltInGzipDecompressor.java  |2 +-
 .../hadoop/io/compress/zlib/ZlibCompressor.java |6 +-
 .../io/compress/zlib/ZlibDecompressor.java  |2 +-
 .../hadoop/io/erasurecode/CodecRegistry.java|  182 +
 .../apache/hadoop/io/erasurecode/CodecUtil.java |   86 +-
 .../apache/hadoop/io/erasurecode/ECSchema.java  |

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HADOOP-13345

2017-03-13 Thread stevel 
Merge branch 'trunk' into HADOOP-13345


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

Branch: refs/heads/HADOOP-13345
Commit: 566c8b74fe7a5a72fc2cc8c8e5a449b0070d6b7c
Parents: 090924a 7992426
Author: Steve Loughran 
Authored: Mon Mar 13 13:55:38 2017 +
Committer: Steve Loughran 
Committed: Mon Mar 13 13:55:38 2017 +

--
 hadoop-client-modules/hadoop-client/pom.xml |   4 -
 .../hadoop-cloud-storage/pom.xml|   4 -
 hadoop-common-project/hadoop-common/pom.xml |   5 -
 .../src/main/conf/log4j.properties  |   9 +
 .../fs/CommonConfigurationKeysPublic.java   |  29 +-
 .../org/apache/hadoop/fs/shell/Command.java |  14 +-
 .../java/org/apache/hadoop/io/SequenceFile.java |  20 +-
 .../main/java/org/apache/hadoop/ipc/Client.java |   4 +-
 .../java/org/apache/hadoop/net/InnerNode.java   |   2 +-
 .../org/apache/hadoop/net/InnerNodeImpl.java|  22 +-
 .../org/apache/hadoop/net/NetworkTopology.java  |  27 +-
 .../java/org/apache/hadoop/util/ConfTest.java   |   2 +-
 .../org/apache/hadoop/util/StringUtils.java |  11 +
 .../src/main/resources/core-default.xml |  35 ++
 .../src/site/markdown/CLIMiniCluster.md.vm  |   1 +
 .../src/site/markdown/ClusterSetup.md   |   4 +-
 .../hadoop-common/src/site/markdown/Metrics.md  |   7 +-
 .../site/markdown/filesystem/introduction.md|  85 
 .../conf/TestCommonConfigurationFields.java |   1 +
 .../org/apache/hadoop/io/TestSequenceFile.java  |  68 ++-
 .../apache/hadoop/net/TestClusterTopology.java  |   5 +-
 hadoop-common-project/hadoop-kms/pom.xml|   4 -
 .../key/kms/server/KMSAuthenticationFilter.java |   3 +-
 .../hadoop-kms/src/site/markdown/index.md.vm|   2 +-
 .../apache/hadoop/oncrpc/SimpleTcpServer.java   |   1 +
 .../apache/hadoop/oncrpc/SimpleUdpServer.java   |   1 +
 .../java/org/apache/hadoop/portmap/Portmap.java |   2 +
 .../java/org/apache/hadoop/hdfs/DFSClient.java  |   4 +-
 .../hadoop/hdfs/DistributedFileSystem.java  |  11 +-
 .../apache/hadoop/hdfs/client/HdfsAdmin.java|  10 +-
 .../hadoop/hdfs/protocol/ClientProtocol.java|   5 +-
 .../hadoop/hdfs/protocol/DatanodeInfo.java  |  52 +-
 .../hadoop/hdfs/protocol/HdfsConstants.java |  10 +-
 .../hadoop/hdfs/protocol/HdfsFileStatus.java|   2 +-
 .../ClientNamenodeProtocolTranslatorPB.java |   6 +-
 .../hadoop/hdfs/protocolPB/PBHelperClient.java  |   8 +-
 .../apache/hadoop/hdfs/web/JsonUtilClient.java  |   2 +
 .../hdfs/web/resources/DeleteOpParam.java   |  11 +-
 .../hadoop/hdfs/web/resources/GetOpParam.java   |  11 +-
 .../hadoop/hdfs/web/resources/PostOpParam.java  |  11 +-
 .../hadoop/hdfs/web/resources/PutOpParam.java   |  11 +-
 .../src/main/proto/erasurecoding.proto  |   2 +-
 .../src/main/proto/hdfs.proto   |   2 +
 hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml  |   8 -
 .../dev-support/findbugsExcludeFile.xml |   6 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |  16 +-
 ...tNamenodeProtocolServerSideTranslatorPB.java |   4 +-
 .../server/blockmanagement/BlockManager.java|  22 +-
 .../blockmanagement/DatanodeDescriptor.java |  13 +
 .../server/blockmanagement/SlowPeerTracker.java |   4 +-
 .../apache/hadoop/hdfs/server/common/Util.java  |  17 +
 .../hdfs/server/datanode/BPServiceActor.java|   2 +-
 .../hadoop/hdfs/server/datanode/DNConf.java |  17 +-
 .../hadoop/hdfs/server/datanode/DataNode.java   |  83 +++-
 .../hdfs/server/datanode/FileIoProvider.java|   2 +-
 .../server/datanode/ProfilingFileIoEvents.java  |  11 +-
 .../datanode/fsdataset/impl/FsDatasetImpl.java  |  28 +-
 .../datanode/fsdataset/impl/FsVolumeList.java   |  13 +-
 .../datanode/metrics/DataNodeDiskMetrics.java   | 181 +++
 .../datanode/metrics/DataNodePeerMetrics.java   |   6 +-
 .../datanode/metrics/OutlierDetector.java   | 182 +++
 .../datanode/metrics/SlowNodeDetector.java  | 194 
 .../web/RestCsrfPreventionFilterHandler.java|   6 +-
 .../datanode/web/webhdfs/WebHdfsHandler.java|  33 +-
 .../namenode/ErasureCodingPolicyManager.java| 107 ++--
 .../server/namenode/FSDirErasureCodingOp.java   | 139 +++---
 .../server/namenode/FSDirStatAndListingOp.java  |   4 +-
 .../hdfs/server/namenode/FSDirWriteFileOp.java  |  48 +-
 .../hdfs/server/namenode/FSDirectory.java   |   3 +-
 .../hdfs/server/namenode/FSEditLogLoader.java   |  23 +-
 .../hdfs/server/namenode/FSImageFormat.java |   6 +-
 .../server/namenode/FSImageFormatPBINode.java   |  29 +-
 .../hdfs/server/namenode/FSNamesystem.java  |  28 +-
 .../hadoop/hdfs/server/namenode/INodeFile.java  |  79 ++-

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HADOOP-13345

2017-02-22 Thread liuml07 
Merge branch 'trunk' into HADOOP-13345

After HADOOP-14040, we use shaded aws sdk uber-JAR so we don't have to
bring DynamoDB dependency explicitly. However, for tests we do need the
DynamoDBLocal dependency from its Maven repository.


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

Branch: refs/heads/HADOOP-13345
Commit: 4f7f2baf68dd5cd9639edc87b5034a7618e26099
Parents: 2ff5812 0013090
Author: Mingliang Liu 
Authored: Wed Feb 22 15:12:24 2017 -0800
Committer: Mingliang Liu 
Committed: Wed Feb 22 15:12:24 2017 -0800

--
 .gitignore  |  12 +-
 .../resources/assemblies/hadoop-httpfs-dist.xml |  25 +-
 .../main/resources/checkstyle/checkstyle.xml|   4 +-
 hadoop-client-modules/hadoop-client-api/pom.xml |  12 +-
 .../hadoop-client-minicluster/pom.xml   |  22 +-
 .../hadoop-client-runtime/pom.xml   |  16 +-
 .../org/apache/hadoop/conf/Configuration.java   |  12 +
 .../hadoop/crypto/key/CachingKeyProvider.java   |  14 +-
 .../apache/hadoop/crypto/key/KeyProvider.java   |  12 +
 .../hadoop/crypto/key/KeyProviderExtension.java |   5 +
 .../org/apache/hadoop/crypto/key/KeyShell.java  |  67 +-
 .../crypto/key/kms/KMSClientProvider.java   |  13 +-
 .../hadoop/crypto/key/kms/KMSRESTConstants.java |   1 +
 .../key/kms/LoadBalancingKMSClientProvider.java |  24 +-
 .../hadoop/crypto/key/kms/ValueQueue.java   | 117 ++-
 .../org/apache/hadoop/fs/BlockLocation.java |   7 +-
 .../hadoop/fs/CommonConfigurationKeys.java  |  11 +
 .../apache/hadoop/fs/FSExceptionMessages.java   |   3 +
 .../java/org/apache/hadoop/fs/FileStatus.java   |  21 +-
 .../hadoop/fs/permission/FsCreateModes.java |   1 +
 .../hadoop/fs/permission/FsPermission.java  |  22 +-
 .../java/org/apache/hadoop/fs/shell/Stat.java   |   4 +-
 .../apache/hadoop/ha/ActiveStandbyElector.java  |  37 +-
 .../org/apache/hadoop/http/HttpServer2.java | 119 ++-
 .../hadoop/io/retry/RetryInvocationHandler.java |   8 +-
 .../main/java/org/apache/hadoop/ipc/Client.java |   6 +-
 .../org/apache/hadoop/ipc/FairCallQueue.java| 165 +---
 .../main/java/org/apache/hadoop/ipc/Server.java | 206 ++--
 .../java/org/apache/hadoop/net/InnerNode.java   |  67 ++
 .../org/apache/hadoop/net/InnerNodeImpl.java| 304 ++
 .../org/apache/hadoop/net/NetworkTopology.java  | 326 +-
 .../net/NetworkTopologyWithNodeGroup.java   |  43 +-
 .../AuthenticationWithProxyUserFilter.java  |  43 +-
 .../hadoop/security/UserGroupInformation.java   | 129 ++-
 .../ZKDelegationTokenSecretManager.java |  33 +-
 .../src/site/markdown/CommandsManual.md |   3 +
 .../src/site/markdown/CredentialProviderAPI.md  |   1 +
 .../src/site/markdown/FileSystemShell.md|   2 +-
 .../hadoop-common/src/site/markdown/Metrics.md  |   6 +
 .../src/site/markdown/SecureMode.md |   2 +-
 .../hadoop-common/src/site/markdown/Tracing.md  |   2 +-
 .../apache/hadoop/crypto/key/TestKeyShell.java  |   9 +
 .../org/apache/hadoop/fs/TestFileStatus.java|  19 +
 .../hadoop/ha/TestActiveStandbyElector.java |  31 +
 .../org/apache/hadoop/http/TestHttpServer.java  |  38 +
 .../hadoop/http/TestHttpServerWithSpengo.java   |  15 +-
 .../apache/hadoop/ipc/TestFairCallQueue.java|  57 +-
 .../java/org/apache/hadoop/ipc/TestRPC.java | 119 +++
 .../hadoop/security/TestUGIWithMiniKdc.java |   1 +
 .../security/TestUserGroupInformation.java  |  16 +-
 .../src/test/resources/testConf.xml |   2 +-
 ...rKeyGeneratorKeyProviderCryptoExtension.java |   6 +
 .../hadoop/crypto/key/kms/server/KMS.java   |  33 +-
 .../crypto/key/kms/server/KMSConfiguration.java |   2 +
 .../hadoop/crypto/key/kms/server/KMSWebApp.java |  10 -
 .../crypto/key/kms/server/KMSWebServer.java |   3 +
 .../kms/server/KeyAuthorizationKeyProvider.java |  11 +
 .../src/main/resources/kms-default.xml  |  14 +
 .../hadoop-kms/src/site/markdown/index.md.vm|  52 +-
 .../hadoop/crypto/key/kms/server/TestKMS.java   |  89 +-
 .../crypto/key/kms/server/TestKMSAudit.java |   2 +
 .../org/apache/hadoop/fs/HdfsBlockLocation.java |  17 +-
 .../java/org/apache/hadoop/hdfs/DFSClient.java  |   2 +-
 .../org/apache/hadoop/hdfs/DFSInputStream.java  |  48 +-
 .../org/apache/hadoop/hdfs/DataStreamer.java| 105 +-
 .../hadoop/hdfs/DistributedFileSystem.java  |   2 +-
 .../apache/hadoop/hdfs/StripedDataStreamer.java |   8 +-
 .../hadoop/hdfs/protocol/ClientProtocol.java|   2 +-
 .../hadoop/hdfs/protocol/DatanodeInfo.java  |   6 +-
 .../hdfs/protocol/FsPermissionExtension.java|   2 +
 .../hadoop/hdfs/protocolPB/PBHelperClient.java  |  51 +

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HADOOP-13345

2017-01-30 Thread fabbri 
Merge branch 'trunk' into HADOOP-13345

Only conflicts were from HADOOP-13989, which was straightforward (remove source
jar option).

Conflicts:
hadoop-client-modules/hadoop-client-minicluster/pom.xml
hadoop-client-modules/hadoop-client-runtime/pom.xml


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

Branch: refs/heads/HADOOP-13345
Commit: ba10b4a77d824b308a3e49003368bb1ec1c58f95
Parents: b22c0d6 11e44bd
Author: Aaron Fabbri 
Authored: Mon Jan 30 15:31:34 2017 -0800
Committer: Aaron Fabbri 
Committed: Mon Jan 30 15:31:34 2017 -0800

--
 BUILDING.txt|   2 +
 dev-support/bin/create-release  |   5 +-
 hadoop-assemblies/pom.xml   |   4 +-
 .../main/resources/assemblies/hadoop-dist.xml   |  14 -
 .../assemblies/hadoop-mapreduce-dist.xml|  14 -
 .../resources/assemblies/hadoop-yarn-dist.xml   |  14 -
 hadoop-build-tools/pom.xml  |   2 +-
 hadoop-client-modules/hadoop-client-api/pom.xml |   4 +-
 .../hadoop-client-check-invariants/pom.xml  |   4 +-
 .../hadoop-client-check-test-invariants/pom.xml |   4 +-
 .../hadoop-client-integration-tests/pom.xml |   4 +-
 .../hadoop-client-minicluster/pom.xml   |   5 +-
 .../hadoop-client-runtime/pom.xml   |   5 +-
 hadoop-client-modules/hadoop-client/pom.xml |   4 +-
 hadoop-client-modules/pom.xml   |   2 +-
 .../hadoop-cloud-storage/pom.xml|   4 +-
 hadoop-cloud-storage-project/pom.xml|   4 +-
 .../hadoop-annotations/pom.xml  |   4 +-
 .../hadoop-auth-examples/pom.xml|   4 +-
 hadoop-common-project/hadoop-auth/pom.xml   |   4 +-
 hadoop-common-project/hadoop-common/pom.xml |   9 +-
 .../hadoop-common/src/main/bin/hadoop   |  13 +-
 .../src/main/bin/hadoop-functions.sh| 215 -
 .../hadoop-common/src/main/bin/start-all.sh |  23 +-
 .../hadoop-common/src/main/bin/stop-all.sh  |  19 +-
 .../crypto/key/kms/KMSClientProvider.java   |  20 +-
 .../apache/hadoop/fs/DelegateToFileSystem.java  |   2 +-
 .../java/org/apache/hadoop/fs/GlobPattern.java  |   2 +-
 .../main/java/org/apache/hadoop/ha/HAAdmin.java |  47 +-
 .../org/apache/hadoop/http/HttpServer2.java |   4 +-
 .../hadoop/metrics2/lib/RollingAverages.java|  57 +-
 .../AuthenticationFilterInitializer.java|   9 +-
 .../AuthenticationWithProxyUserFilter.java  | 119 +++
 .../java/org/apache/hadoop/security/Groups.java |  11 +-
 .../hadoop/security/UserGroupInformation.java   |  65 +-
 .../security/ssl/FileBasedKeyStoresFactory.java |   2 +-
 .../apache/hadoop/security/ssl/SSLFactory.java  |  28 +-
 .../AbstractDelegationTokenSecretManager.java   |   6 +-
 .../main/java/org/apache/hadoop/util/Shell.java |  52 +-
 .../src/site/markdown/CredentialProviderAPI.md  |   2 +
 .../hadoop-common/src/site/markdown/Metrics.md  |  53 +-
 .../src/site/markdown/UnixShellGuide.md |   9 +
 .../3.0.0-alpha2/CHANGES.3.0.0-alpha2.md| 927 +++
 .../3.0.0-alpha2/RELEASENOTES.3.0.0-alpha2.md   | 618 +
 .../hadoop/fs/TestDelegateToFsCheckPath.java|  35 +-
 .../org/apache/hadoop/fs/TestGlobPattern.java   |   8 +-
 .../org/apache/hadoop/http/TestHttpServer.java  |   2 +-
 .../hadoop/http/TestHttpServerWithSpengo.java   | 239 +
 .../apache/hadoop/http/TestSSLHttpServer.java   |   2 +-
 .../metrics2/lib/TestRollingAverages.java   |  13 +-
 .../security/TestAuthenticationFilter.java  |  13 +-
 .../TestAuthenticationWithProxyUserFilter.java  |  78 ++
 .../security/TestFixKerberosTicketOrder.java| 158 
 .../hadoop/security/TestRaceWhenRelogin.java| 162 
 .../java/org/apache/hadoop/util/TestShell.java  |   4 +-
 .../scripts/hadoop-functions_test_helper.bash   |   6 +-
 .../src/test/scripts/hadoop_abs.bats|  65 ++
 .../test/scripts/hadoop_get_verify_uservar.bats |  21 +
 .../test/scripts/hadoop_privilege_check.bats|  26 +
 hadoop-common-project/hadoop-kms/pom.xml|  20 +-
 .../crypto/key/kms/server/KMSWebServer.java |  21 +-
 .../hadoop-kms/src/site/markdown/index.md.vm|   3 +
 .../hadoop/crypto/key/kms/server/MiniKMS.java   |  11 +-
 .../hadoop/crypto/key/kms/server/TestKMS.java   |   6 +-
 hadoop-common-project/hadoop-minikdc/pom.xml|   4 +-
 hadoop-common-project/hadoop-nfs/pom.xml|   4 +-
 .../org/apache/hadoop/oncrpc/RpcProgram.java|  30 +-
 .../apache/hadoop/oncrpc/SimpleUdpClient.java   |  11 +-
 hadoop-common-project/pom.xml   |   4 +-
 hadoop-dist/pom.xml |  14 +-

[50/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HADOOP-13345

2016-11-22 Thread liuml07 
Merge branch 'trunk' into HADOOP-13345


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

Branch: refs/heads/HADOOP-13345
Commit: 86a67ffacde77b0824a32c560104288361fa17d4
Parents: f4c37a5 2bf9a15
Author: Mingliang Liu 
Authored: Tue Nov 22 14:53:33 2016 -0800
Committer: Mingliang Liu 
Committed: Tue Nov 22 14:53:33 2016 -0800

--
 .gitignore  |   13 +
 BUILDING.txt|4 +-
 LICENSE.txt |  100 ++
 dev-support/bin/create-release  |2 +-
 dev-support/docker/Dockerfile   |   10 +
 .../resources/assemblies/hadoop-yarn-dist.xml   |7 +
 .../hadoop-cloud-storage/pom.xml|  127 ++
 hadoop-cloud-storage-project/pom.xml|   54 +
 .../dev-support/findbugsExcludeFile.xml |6 +
 hadoop-common-project/hadoop-common/pom.xml |   15 +-
 .../hadoop-common/src/main/conf/hadoop-env.sh   |6 -
 .../org/apache/hadoop/conf/ConfServlet.java |8 +-
 .../hadoop/crypto/key/JavaKeyStoreProvider.java |   31 +-
 .../apache/hadoop/fs/FSExceptionMessages.java   |2 +
 .../java/org/apache/hadoop/fs/FileSystem.java   |7 +-
 .../java/org/apache/hadoop/fs/FileUtil.java |   27 +-
 .../apache/hadoop/fs/RawLocalFileSystem.java|   12 +-
 .../apache/hadoop/fs/TrashPolicyDefault.java|5 +-
 .../apache/hadoop/fs/viewfs/ViewFileSystem.java |   44 +-
 .../hadoop/http/AdminAuthorizedServlet.java |   11 +-
 .../org/apache/hadoop/http/HttpServer2.java |   32 +-
 .../main/java/org/apache/hadoop/ipc/Server.java |   61 +-
 .../hadoop/ipc/metrics/RpcDetailedMetrics.java  |4 +-
 .../apache/hadoop/ipc/metrics/RpcMetrics.java   |5 +
 .../org/apache/hadoop/jmx/JMXJsonServlet.java   |8 +-
 .../java/org/apache/hadoop/log/LogLevel.java|   11 +-
 .../apache/hadoop/metrics2/MetricsPlugin.java   |2 +-
 .../metrics2/filter/AbstractPatternFilter.java  |2 +-
 .../hadoop/metrics2/impl/MetricsConfig.java |   38 +-
 .../hadoop/metrics2/impl/MetricsSystemImpl.java |4 +-
 .../hadoop/metrics2/lib/MetricsRegistry.java|8 +
 .../metrics2/lib/MutableMetricsFactory.java |3 +
 .../hadoop/metrics2/lib/MutableRates.java   |6 +
 .../lib/MutableRatesWithAggregation.java|  148 +++
 .../apache/hadoop/metrics2/lib/MutableStat.java |4 +
 .../apache/hadoop/metrics2/sink/FileSink.java   |2 +-
 .../hadoop/metrics2/sink/GraphiteSink.java  |2 +-
 .../metrics2/sink/RollingFileSystemSink.java|2 +-
 .../apache/hadoop/metrics2/sink/StatsDSink.java |2 +-
 .../sink/ganglia/AbstractGangliaSink.java   |2 +-
 .../metrics2/sink/ganglia/GangliaSink30.java|   26 +-
 .../apache/hadoop/metrics2/util/SampleStat.java |   19 +-
 .../hadoop/security/UserGroupInformation.java   |   70 +-
 .../AbstractDelegationTokenSecretManager.java   |   69 +-
 .../DelegationTokenAuthenticationHandler.java   |   32 +-
 .../hadoop/util/GenericOptionsParser.java   |   54 +-
 .../main/java/org/apache/hadoop/util/Shell.java |2 +-
 .../main/java/org/apache/hadoop/util/Time.java  |   18 +
 .../hadoop-common/src/main/java/overview.html   |  274 -
 .../src/main/resources/core-default.xml |   48 +-
 .../src/site/markdown/FileSystemShell.md|  324 -
 .../src/site/markdown/filesystem/filesystem.md  |   17 +-
 .../site/markdown/filesystem/introduction.md|4 +-
 .../apache/hadoop/conf/TestConfiguration.java   |   16 +-
 .../conf/TestConfigurationFieldsBase.java   |   47 +
 .../org/apache/hadoop/fs/TestFsShellCopy.java   |   51 +
 .../fs/contract/AbstractContractCreateTest.java |   96 +-
 .../AbstractContractGetFileStatusTest.java  |6 +
 .../hadoop/fs/contract/ContractTestUtils.java   |   31 +
 .../fs/viewfs/ViewFileSystemBaseTest.java   |   68 ++
 .../org/apache/hadoop/http/TestHttpServer.java  |   17 +-
 .../org/apache/hadoop/io/file/tfile/Timer.java  |   52 +-
 .../java/org/apache/hadoop/ipc/TestRPC.java |   29 +-
 .../metrics2/filter/TestPatternFilter.java  |2 +-
 .../hadoop/metrics2/impl/ConfigBuilder.java |   11 +-
 .../apache/hadoop/metrics2/impl/ConfigUtil.java |   14 +-
 .../metrics2/impl/TestMetricsCollectorImpl.java |2 +-
 .../hadoop/metrics2/impl/TestMetricsConfig.java |2 +-
 .../metrics2/impl/TestMetricsSystemImpl.java|2 +-
 .../hadoop/metrics2/lib/TestMutableMetrics.java |  165 ++-
 .../sink/RollingFileSystemSinkTestBase.java |2 +-
 .../sink/TestRollingFileSystemSink.java |2 +-
 .../metrics2/sink/ganglia/TestGangliaSink.java  |2 +-
 .../hadoop/security/TestUGIWithMiniKdc.java