hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aengin...@apache.org
Subject [22/22] hadoop git commit: Merge branch 'trunk' into HDFS-7240
Date Thu, 15 Mar 2018 17:49:45 GMT
Merge branch 'trunk' into HDFS-7240

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolManager.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeMetrics.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/diskbalancer/command/TestDiskBalancerCommand.java

Fixed these conflicts by accepting the trunk version of the same files.


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

Branch: refs/heads/HDFS-7240
Commit: 1f74cb2f1a065e5c556f1c8acc4aa3a9782c00c6
Parents: ce23d9a da777a5
Author: Anu Engineer <aengineer@apache.org>
Authored: Thu Mar 15 10:40:02 2018 -0700
Committer: Anu Engineer <aengineer@apache.org>
Committed: Thu Mar 15 10:40:02 2018 -0700

----------------------------------------------------------------------
 .../src/main/conf/log4j.properties              |   4 +-
 .../org/apache/hadoop/conf/ConfServlet.java     |   8 +-
 .../hadoop/http/AdminAuthorizedServlet.java     |  11 +-
 .../org/apache/hadoop/http/HttpServer2.java     |  32 +-
 .../org/apache/hadoop/jmx/JMXJsonServlet.java   |   8 +-
 .../java/org/apache/hadoop/log/LogLevel.java    |  11 +-
 .../hadoop/security/UserGroupInformation.java   |   5 +-
 .../apache/hadoop/conf/TestConfiguration.java   |  18 +-
 .../org/apache/hadoop/http/TestHttpServer.java  |  17 +-
 .../org/apache/hadoop/minikdc/TestMiniKdc.java  |   2 +-
 .../hdfs/protocol/ZoneReencryptionStatus.java   |   2 +-
 .../http/server/TestHttpFSServerWebServer.java  |   4 +-
 .../hdfs/server/datanode/BlockPoolManager.java  |  11 +-
 .../datanode/fsdataset/impl/BlockPoolSlice.java |   6 +-
 .../datamodel/DiskBalancerCluster.java          |   3 +-
 .../federation/metrics/StateStoreMetrics.java   |   5 +
 .../router/RouterHeartbeatService.java          |  18 +-
 .../driver/StateStoreRecordOperations.java      |  15 -
 .../driver/impl/StateStoreFileBaseImpl.java     | 433 ++++++++--------
 .../store/driver/impl/StateStoreFileImpl.java   | 109 ++--
 .../driver/impl/StateStoreFileSystemImpl.java   | 128 ++---
 .../driver/impl/StateStoreZooKeeperImpl.java    |  17 +-
 .../hadoop/hdfs/server/namenode/Content.java    |  32 --
 .../namenode/DirectoryWithQuotaFeature.java     |  19 -
 .../hdfs/server/namenode/FSDirRenameOp.java     |  14 +-
 .../hdfs/server/namenode/FSDirectory.java       |   9 +-
 .../hadoop/hdfs/server/namenode/INode.java      |  16 +-
 .../hdfs/server/namenode/INodeDirectory.java    |  25 +-
 .../snapshot/DirectorySnapshottableFeature.java |   3 +-
 .../snapshot/DirectoryWithSnapshotFeature.java  |   3 +-
 .../snapshot/FSImageFormatPBSnapshot.java       |   2 +-
 .../apache/hadoop/hdfs/tools/AdminHelper.java   |   2 +-
 .../apache/hadoop/hdfs/util/EnumCounters.java   |  72 +--
 .../hadoop-hdfs/src/site/markdown/WebHDFS.md    |  92 ++++
 .../org/apache/hadoop/hdfs/MiniDFSCluster.java  |  16 +
 ...edTestDFSStripedOutputStreamWithFailure.java |  71 +++
 ...tputStreamWithFailureWithRandomECPolicy.java |  49 ++
 .../TestDFSStripedOutputStreamWithFailure.java  | 496 +------------------
 ...estDFSStripedOutputStreamWithFailure000.java |  24 -
 ...estDFSStripedOutputStreamWithFailure010.java |  24 -
 ...estDFSStripedOutputStreamWithFailure020.java |  24 -
 ...estDFSStripedOutputStreamWithFailure030.java |  24 -
 ...estDFSStripedOutputStreamWithFailure040.java |  24 -
 ...estDFSStripedOutputStreamWithFailure050.java |  24 -
 ...estDFSStripedOutputStreamWithFailure060.java |  24 -
 ...estDFSStripedOutputStreamWithFailure070.java |  24 -
 ...estDFSStripedOutputStreamWithFailure080.java |  24 -
 ...estDFSStripedOutputStreamWithFailure090.java |  24 -
 ...estDFSStripedOutputStreamWithFailure100.java |  24 -
 ...estDFSStripedOutputStreamWithFailure110.java |  24 -
 ...estDFSStripedOutputStreamWithFailure120.java |  24 -
 ...estDFSStripedOutputStreamWithFailure130.java |  24 -
 ...estDFSStripedOutputStreamWithFailure140.java |  24 -
 ...estDFSStripedOutputStreamWithFailure150.java |  24 -
 ...estDFSStripedOutputStreamWithFailure160.java |  24 -
 ...estDFSStripedOutputStreamWithFailure170.java |  24 -
 ...estDFSStripedOutputStreamWithFailure180.java |  24 -
 ...estDFSStripedOutputStreamWithFailure190.java |  24 -
 ...estDFSStripedOutputStreamWithFailure200.java |  24 -
 ...estDFSStripedOutputStreamWithFailure210.java |  24 -
 ...stDFSStripedOutputStreamWithFailureBase.java | 426 ++++++++++++++++
 .../java/org/apache/hadoop/hdfs/TestQuota.java  |   4 +-
 .../TestReadStripedFileWithMissingBlocks.java   |  59 ++-
 .../datanode/TestDataNodeHotSwapVolumes.java    |   7 +-
 .../datanode/TestDataNodeVolumeFailure.java     |  20 +-
 .../datanode/TestDataNodeVolumeMetrics.java     |   3 +-
 .../command/TestDiskBalancerCommand.java        |   8 +-
 .../router/TestRouterHeartbeatService.java      | 147 ++++++
 .../store/driver/TestStateStoreDriverBase.java  |   9 +
 .../store/driver/TestStateStoreFile.java        |  12 +
 .../store/driver/TestStateStoreFileBase.java    |  47 ++
 .../store/driver/TestStateStoreFileSystem.java  |  14 +-
 .../v2/app/job/impl/TestTaskAttempt.java        | 150 +++---
 .../azure/TestShellDecryptionKeyProvider.java   |   4 +-
 .../utils/PublishedConfigurationOutputter.java  |   3 +-
 .../yarn/util/DockerClientConfigHandler.java    |   3 +-
 .../yarn/util/TestProcfsBasedProcessTree.java   |   4 +-
 .../hadoop/yarn/server/webapp/AppBlock.java     | 120 +++--
 .../impl/container-executor.c                   |  42 ++
 .../impl/container-executor.h                   |   1 +
 .../TestCGroupsResourceCalculator.java          |  21 +-
 81 files changed, 1599 insertions(+), 1821 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f74cb2f/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f74cb2f/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
----------------------------------------------------------------------


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


Mime
View raw message