[50/50] [abbrv] hadoop git commit: Merge remote-tracking branch 'apache/trunk' into HDFS-7285

2015-09-30 Thread wang 
Merge remote-tracking branch 'apache/trunk' into HDFS-7285

Conflicts:

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java

Change-Id: I53ec1c426dc988d6c4a2c87b00caef49c4057010


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

Branch: refs/heads/trunk
Commit: 6c17d315287020368689fa078a40a1eaedf89d5b
Parents: 8fd5520 854d25b
Author: Zhe Zhang 
Authored: Wed Sep 30 08:39:13 2015 -0700
Committer: Zhe Zhang 
Committed: Wed Sep 30 08:39:13 2015 -0700

--
 hadoop-common-project/hadoop-common/CHANGES.txt |   5 +
 .../org/apache/hadoop/fs/FSOutputSummer.java|   3 -
 .../main/java/org/apache/hadoop/util/GSet.java  |  14 ++
 .../org/apache/hadoop/util/GSetByHashMap.java   |   6 +
 .../org/apache/hadoop/util/LightWeightGSet.java |  82 --
 .../hadoop/util/LightWeightResizableGSet.java   | 129 ++
 .../hadoop-common/src/site/markdown/Tracing.md  |  15 +-
 .../apache/hadoop/fs/shell/TestTextCommand.java |  15 +-
 .../java/org/apache/hadoop/util/TestGSet.java   |  69 -
 .../hadoop/util/TestLightWeightCache.java   |   6 +
 .../util/TestLightWeightResizableGSet.java  | 252 +++
 .../apache/hadoop/hdfs/BlockReaderFactory.java  | 114 +++--
 .../apache/hadoop/hdfs/BlockReaderLocal.java|  77 ++
 .../hadoop/hdfs/BlockReaderLocalLegacy.java |  20 +-
 .../java/org/apache/hadoop/hdfs/DFSClient.java  |  36 +--
 .../org/apache/hadoop/hdfs/DFSInputStream.java  |  85 +++
 .../org/apache/hadoop/hdfs/DFSOutputStream.java |  36 +--
 .../org/apache/hadoop/hdfs/DFSUtilClient.java   |  10 +-
 .../org/apache/hadoop/hdfs/DataStreamer.java|  40 +--
 .../apache/hadoop/hdfs/RemoteBlockReader.java   |   4 +-
 .../apache/hadoop/hdfs/RemoteBlockReader2.java  |  25 +-
 .../hdfs/client/HdfsClientConfigKeys.java   |   2 -
 .../hadoop/hdfs/client/impl/LeaseRenewer.java   |  18 +-
 .../protocol/datatransfer/PacketReceiver.java   |   8 +-
 .../hdfs/protocol/datatransfer/Sender.java  |   6 +-
 .../datatransfer/sasl/DataTransferSaslUtil.java |   8 +-
 .../ClientDatanodeProtocolTranslatorPB.java |  10 +-
 .../hdfs/shortcircuit/DfsClientShmManager.java  |  45 +---
 .../hdfs/shortcircuit/ShortCircuitCache.java| 101 ++--
 .../hdfs/shortcircuit/ShortCircuitReplica.java  |  33 +--
 .../hdfs/shortcircuit/ShortCircuitShm.java  |  14 +-
 .../hadoop/hdfs/util/ByteArrayManager.java  |  63 +
 .../org/apache/hadoop/hdfs/web/TokenAspect.java |   8 +-
 .../hadoop/hdfs/web/URLConnectionFactory.java   |   4 +-
 .../hadoop/hdfs/web/WebHdfsFileSystem.java  |  28 +--
 .../services/org.apache.hadoop.fs.FileSystem|   1 +
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  21 ++
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |   9 +-
 .../java/org/apache/hadoop/hdfs/DFSUtil.java|  37 +--
 .../hadoop/hdfs/server/datanode/DataNode.java   |  11 +-
 .../hdfs/server/datanode/DirectoryScanner.java  |   8 -
 .../hdfs/server/datanode/ReplicaInfo.java   |  27 +-
 .../datanode/fsdataset/impl/BlockPoolSlice.java |   7 +-
 .../datanode/fsdataset/impl/ReplicaMap.java |  38 +--
 .../server/datanode/web/DatanodeHttpServer.java |  15 ++
 .../hdfs/server/namenode/NameNodeRpcServer.java |   2 +-
 .../hdfs/server/namenode/NamenodeFsck.java  |   5 +-
 .../services/org.apache.hadoop.fs.FileSystem|  16 --
 .../src/main/resources/hdfs-default.xml |   8 -
 .../org/apache/hadoop/hdfs/TestDFSUtil.java | 144 ---
 .../blockmanagement/TestBlockTokenWithDFS.java  |   2 +
 .../datanode/TestDataNodeVolumeFailure.java |   2 +
 .../apache/hadoop/tracing/TestTraceAdmin.java   |   8 +-
 hadoop-yarn-project/CHANGES.txt |   6 +
 .../localizer/LocalResourcesTracker.java|   3 +-
 .../localizer/LocalResourcesTrackerImpl.java|  24 +-
 .../localizer/ResourceLocalizationService.java  |   5 +-
 .../TestLocalResourcesTrackerImpl.java  |  65 -
 .../TestResourceLocalizationService.java|  16 +-
 .../scheduler/fair/QueueManager.java|  80 --
 60 files changed, 1157 insertions(+), 794 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c17d315/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java
--

[50/50] [abbrv] hadoop git commit: Merge remote-tracking branch 'apache/trunk' into HDFS-7285

2015-09-01 Thread zhz 
Merge remote-tracking branch 'apache/trunk' into HDFS-7285


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

Branch: refs/heads/HDFS-7285
Commit: 53358fe680a11c1b66a7f60733d11c1f4efe0232
Parents: ab56fcd 2e251a7
Author: Zhe Zhang 
Authored: Tue Sep 1 00:29:55 2015 -0700
Committer: Zhe Zhang 
Committed: Tue Sep 1 14:48:37 2015 -0700

--
 hadoop-common-project/hadoop-common/CHANGES.txt |   9 +
 hadoop-common-project/hadoop-common/pom.xml |  19 +-
 .../fs/CommonConfigurationKeysPublic.java   |   7 +
 .../src/main/resources/core-default.xml |  14 +-
 .../src/site/markdown/FileSystemShell.md|  13 +-
 .../java/org/apache/hadoop/fs/test-untar.tar| Bin 20480 -> 0 bytes
 .../java/org/apache/hadoop/fs/test-untar.tgz| Bin 2024 -> 0 bytes
 .../fs/viewfs/ViewFileSystemBaseTest.java   |   2 +-
 .../apache/hadoop/fs/viewfs/ViewFsBaseTest.java |   2 +-
 .../src/test/resources/test-untar.tar   | Bin 0 -> 20480 bytes
 .../src/test/resources/test-untar.tgz   | Bin 0 -> 2024 bytes
 hadoop-hdfs-project/hadoop-hdfs-client/pom.xml  |   5 +
 .../org/apache/hadoop/hdfs/BlockReader.java | 110 +++
 .../apache/hadoop/hdfs/BlockReaderLocal.java| 748 +++
 .../hadoop/hdfs/BlockReaderLocalLegacy.java | 743 ++
 .../org/apache/hadoop/hdfs/BlockReaderUtil.java |  57 ++
 .../org/apache/hadoop/hdfs/ClientContext.java   | 196 +
 .../org/apache/hadoop/hdfs/DFSUtilClient.java   |  68 ++
 .../apache/hadoop/hdfs/ExternalBlockReader.java | 126 
 .../apache/hadoop/hdfs/KeyProviderCache.java| 112 +++
 .../java/org/apache/hadoop/hdfs/PeerCache.java  | 291 
 .../apache/hadoop/hdfs/RemoteBlockReader.java   | 517 +
 .../apache/hadoop/hdfs/RemoteBlockReader2.java  | 485 
 .../hadoop/hdfs/client/BlockReportOptions.java  |  59 ++
 .../hdfs/client/HdfsClientConfigKeys.java   |  13 +
 .../hdfs/protocol/BlockLocalPathInfo.java   |  70 ++
 .../hdfs/protocol/ClientDatanodeProtocol.java   | 152 
 .../InvalidEncryptionKeyException.java  |  40 +
 .../protocol/datatransfer/PacketHeader.java | 214 ++
 .../protocol/datatransfer/PacketReceiver.java   | 310 
 .../protocolPB/ClientDatanodeProtocolPB.java|  37 +
 .../ClientDatanodeProtocolTranslatorPB.java | 326 
 .../hadoop/hdfs/protocolPB/PBHelperClient.java  |  13 +
 .../token/block/BlockTokenSelector.java |  48 ++
 .../hdfs/util/ByteBufferOutputStream.java   |  49 ++
 .../hadoop/hdfs/web/URLConnectionFactory.java   |  30 +-
 .../hadoop/hdfs/web/WebHdfsFileSystem.java  |  15 +-
 .../hdfs/web/oauth2/AccessTokenProvider.java|  66 ++
 .../hdfs/web/oauth2/AccessTokenTimer.java   | 103 +++
 .../ConfCredentialBasedAccessTokenProvider.java |  62 ++
 ...onfRefreshTokenBasedAccessTokenProvider.java | 146 
 .../CredentialBasedAccessTokenProvider.java | 135 
 .../oauth2/OAuth2ConnectionConfigurator.java|  79 ++
 .../hadoop/hdfs/web/oauth2/OAuth2Constants.java |  46 ++
 .../apache/hadoop/hdfs/web/oauth2/Utils.java|  63 ++
 .../hadoop/hdfs/web/oauth2/package-info.java|  26 +
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  22 +
 hadoop-hdfs-project/hadoop-hdfs/pom.xml |   6 +
 .../bkjournal/BookKeeperEditLogInputStream.java |   2 +-
 .../org/apache/hadoop/hdfs/BlockReader.java | 110 ---
 .../apache/hadoop/hdfs/BlockReaderLocal.java| 746 --
 .../hadoop/hdfs/BlockReaderLocalLegacy.java | 740 --
 .../org/apache/hadoop/hdfs/BlockReaderUtil.java |  57 --
 .../org/apache/hadoop/hdfs/ClientContext.java   | 195 -
 .../java/org/apache/hadoop/hdfs/DFSClient.java  |   1 -
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |  14 +-
 .../org/apache/hadoop/hdfs/DFSInputStream.java  |   2 +-
 .../java/org/apache/hadoop/hdfs/DFSUtil.java|  68 +-
 .../apache/hadoop/hdfs/ExternalBlockReader.java | 126 
 .../apache/hadoop/hdfs/KeyProviderCache.java| 111 ---
 .../java/org/apache/hadoop/hdfs/PeerCache.java  | 290 ---
 .../apache/hadoop/hdfs/RemoteBlockReader.java   | 513 -
 .../apache/hadoop/hdfs/RemoteBlockReader2.java  | 482 
 .../hadoop/hdfs/client/BlockReportOptions.java  |  59 --
 .../hdfs/protocol/BlockLocalPathInfo.java   |  70 --
 .../hdfs/protocol/ClientDatanodeProtocol.java   | 152 
 .../hadoop/hdfs/protocol/LayoutVersion.java |   2 +-
 .../InvalidEncryptionKeyException.java  |  40 -
 .../protocol/datatransfer/PacketHeader.java | 214 --
 .../protocol/datatransfer/PacketReceiver.java   | 310 
 .../hdfs/protocol/datatransfer/Receiver.java|  15 +-