hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aengin...@apache.org
Subject [13/13] hadoop git commit: Merge branch 'trunk' into HDFS-7240
Date Thu, 21 Sep 2017 18:17:54 GMT
Merge branch 'trunk' into HDFS-7240


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

Branch: refs/heads/HDFS-7240
Commit: 7c957451f34fb25df297024d6115de4840c41e62
Parents: 5b1f03b b9e423f
Author: Anu Engineer <aengineer@apache.org>
Authored: Thu Sep 21 11:14:49 2017 -0700
Committer: Anu Engineer <aengineer@apache.org>
Committed: Thu Sep 21 11:14:49 2017 -0700

----------------------------------------------------------------------
 .../src/main/conf/log4j.properties              |  12 --
 .../java/org/apache/hadoop/hdfs/DFSClient.java  |  10 +-
 .../hadoop/hdfs/DistributedFileSystem.java      |   4 +-
 .../apache/hadoop/hdfs/client/HdfsAdmin.java    |   4 +-
 .../hdfs/protocol/AddECPolicyResponse.java      |  68 --------
 .../AddErasureCodingPolicyResponse.java         |  68 ++++++++
 .../hadoop/hdfs/protocol/ClientProtocol.java    |   2 +-
 .../ClientNamenodeProtocolTranslatorPB.java     |  11 +-
 .../hadoop/hdfs/protocolPB/PBHelperClient.java  |  22 +--
 .../hdfs/util/CombinedHostsFileReader.java      |  67 +++++---
 .../hdfs/util/CombinedHostsFileWriter.java      |  23 ++-
 .../src/main/proto/erasurecoding.proto          |   2 +-
 .../src/main/proto/hdfs.proto                   |   2 +-
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |   4 +
 ...tNamenodeProtocolServerSideTranslatorPB.java |  13 +-
 .../qjournal/client/QuorumJournalManager.java   |  39 ++---
 .../CombinedHostFileManager.java                |   3 +-
 .../hdfs/server/datanode/VolumeScanner.java     |   6 +
 .../hdfs/server/namenode/FSDirectory.java       |   4 +-
 .../hdfs/server/namenode/FSNamesystem.java      |  15 +-
 .../hdfs/server/namenode/NameNodeRpcServer.java |   9 +-
 .../org/apache/hadoop/hdfs/tools/ECAdmin.java   |   7 +-
 .../src/main/resources/hdfs-default.xml         |  11 ++
 .../src/site/markdown/HdfsDataNodeAdminGuide.md | 165 ++++++++++++++++++
 .../src/site/markdown/HdfsUpgradeDomain.md      | 167 +++++++++++++++++++
 .../org/apache/hadoop/hdfs/DFSTestUtil.java     |   4 +-
 .../hadoop/hdfs/TestErasureCodingPolicies.java  |   7 +-
 .../hadoop/hdfs/protocolPB/TestPBHelper.java    |  25 +--
 .../server/namenode/TestFSEditLogLoader.java    |   4 +-
 .../hdfs/server/namenode/TestFSImage.java       |   5 +-
 .../hdfs/util/TestCombinedHostsFileReader.java  |  44 +++--
 .../src/test/resources/dfs.hosts.json           |  16 +-
 .../src/test/resources/legacy.dfs.hosts.json    |   7 +
 .../hadoop/examples/BaileyBorweinPlouffe.java   |  12 +-
 .../apache/hadoop/examples/DBCountPageView.java |   7 +-
 .../hadoop/examples/dancing/DancingLinks.java   |   7 +-
 .../org/apache/hadoop/examples/pi/DistSum.java  |   6 +-
 .../hadoop/examples/terasort/TeraGen.java       |   6 +-
 .../examples/terasort/TeraOutputFormat.java     |   7 +-
 .../hadoop/examples/terasort/TeraScheduler.java |   7 +-
 .../hadoop/examples/terasort/TeraSort.java      |   6 +-
 .../hadoop/examples/terasort/TestTeraSort.java  |   6 +-
 hadoop-project/src/site/site.xml                |   4 +-
 .../impl/pb/RpcClientFactoryPBImpl.java         |   3 +-
 .../impl/pb/RpcServerFactoryPBImpl.java         |   5 +-
 .../impl/pb/TestRpcClientFactoryPBImpl.java     |  49 ++++++
 .../impl/pb/TestRpcServerFactoryPBImpl.java     |  48 ++++++
 .../linux/resources/CGroupsHandler.java         |   6 +
 .../linux/resources/CGroupsHandlerImpl.java     |   5 +
 .../runtime/DockerLinuxContainerRuntime.java    |  13 +-
 .../runtime/TestDockerContainerRuntime.java     |  13 +-
 51 files changed, 785 insertions(+), 275 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c957451/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelperClient.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c957451/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c957451/hadoop-project/src/site/site.xml
----------------------------------------------------------------------
diff --cc hadoop-project/src/site/site.xml
index 205fe63,a88f0e3..7716633
--- a/hadoop-project/src/site/site.xml
+++ b/hadoop-project/src/site/site.xml
@@@ -101,15 -101,10 +101,17 @@@
        <item name="Synthetic Load Generator" href="hadoop-project-dist/hadoop-hdfs/SLGUserGuide.html"/>
        <item name="Erasure Coding" href="hadoop-project-dist/hadoop-hdfs/HDFSErasureCoding.html"/>
        <item name="Disk Balancer" href="hadoop-project-dist/hadoop-hdfs/HDFSDiskbalancer.html"/>
-    </menu>
+       <item name="Upgrade Domain" href="hadoop-project-dist/hadoop-hdfs/HdfsUpgradeDomain.html"/>
+       <item name="DataNode Admin" href="hadoop-project-dist/hadoop-hdfs/HdfsDataNodeAdminGuide.html"/>
+     </menu>
  
 +    <menu name="Ozone" inherit="top">
 +      <item name="Getting Started" href="hadoop-project-dist/hadoop-hdfs/OzoneGettingStarted.html"/>
 +      <item name="Commands Reference" href="hadoop-project-dist/hadoop-hdfs/OzoneCommandShell.html"/>
 +      <item name="Ozone Rest API" href="hadoop-project-dist/hadoop-hdfs/OzoneRest.html"/>
 +      <item name="Ozone Metrics" href="hadoop-project-dist/hadoop-hdfs/OzoneMetrics.html"/>
 +    </menu>
 +
      <menu name="MapReduce" inherit="top">
        <item name="Tutorial" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapReduceTutorial.html"/>
        <item name="Commands Reference" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/MapredCommands.html"/>


---------------------------------------------------------------------
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