HADOOP-13932. Fix indefinite article in comments (Contributed by LiXin Ge via Daniel Templeton)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e216e8e2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e216e8e2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e216e8e2 Branch: refs/heads/YARN-3926 Commit: e216e8e2334519b7c833d99586218e99a39265f3 Parents: ac1e5d4 Author: Daniel Templeton <templ...@apache.org> Authored: Tue Dec 27 11:12:05 2016 -0800 Committer: Daniel Templeton <templ...@apache.org> Committed: Tue Dec 27 13:03:16 2016 -0800 ---------------------------------------------------------------------- .../namenode/FSImagePreTransactionalStorageInspector.java | 2 +- .../hadoop-hdfs/src/site/markdown/HdfsRollingUpgrade.md | 8 ++++---- hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/LibHdfs.md | 2 +- .../dev-support/jdiff/Apache_Hadoop_YARN_API_2.6.0.xml | 2 +- .../dev-support/jdiff/Apache_Hadoop_YARN_API_2.7.2.xml | 2 +- .../src/main/java/org/apache/hadoop/yarn/conf/HAUtil.java | 4 ++-- .../java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 2 +- .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 8 ++++---- .../resourcemanager/recovery/FileSystemRMStateStore.java | 2 +- .../resourcemanager/scheduler/fair/FSQueueMetrics.java | 2 +- .../java/org/apache/hadoop/yarn/server/MiniYARNCluster.java | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e216e8e2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java index 3cd5ae1..6469385 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImagePreTransactionalStorageInspector.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile; import org.apache.hadoop.io.IOUtils; /** - * Inspects a FSImage storage directory in the "old" (pre-HDFS-1073) format. + * Inspects an FSImage storage directory in the "old" (pre-HDFS-1073) format. * This format has the following data files: * - fsimage * - fsimage.ckpt (when checkpoint is being uploaded) http://git-wip-us.apache.org/repos/asf/hadoop/blob/e216e8e2/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsRollingUpgrade.md ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsRollingUpgrade.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsRollingUpgrade.md index f9b76b8..889d7a0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsRollingUpgrade.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsRollingUpgrade.md @@ -65,7 +65,7 @@ Note that rolling upgrade is supported only from Hadoop-2.4.0 onwards. ### Upgrade without Downtime -In a HA cluster, there are two or more *NameNodes (NNs)*, many *DataNodes (DNs)*, +In an HA cluster, there are two or more *NameNodes (NNs)*, many *DataNodes (DNs)*, a few *JournalNodes (JNs)* and a few *ZooKeeperNodes (ZKNs)*. *JNs* is relatively stable and does not require upgrade when upgrading HDFS in most of the cases. In the rolling upgrade procedure described here, @@ -76,7 +76,7 @@ Upgrading *JNs* and *ZKNs* may incur cluster downtime. Suppose there are two namenodes *NN1* and *NN2*, where *NN1* and *NN2* are respectively in active and standby states. -The following are the steps for upgrading a HA cluster: +The following are the steps for upgrading an HA cluster: 1. Prepare Rolling Upgrade 1. Run "[`hdfs dfsadmin -rollingUpgrade prepare`](#dfsadmin_-rollingUpgrade)" @@ -133,7 +133,7 @@ However, datanodes can still be upgraded in a rolling manner. In a non-HA cluster, there are a *NameNode (NN)*, a *SecondaryNameNode (SNN)* and many *DataNodes (DNs)*. -The procedure for upgrading a non-HA cluster is similar to upgrading a HA cluster +The procedure for upgrading a non-HA cluster is similar to upgrading an HA cluster except that Step 2 "Upgrade Active and Standby *NNs*" is changed to below: * Upgrade *NN* and *SNN* @@ -175,7 +175,7 @@ A newer release is downgradable to the pre-upgrade release only if both the namenode layout version and the datanode layout version are not changed between these two releases. -In a HA cluster, +In an HA cluster, when a rolling upgrade from an old software release to a new software release is in progress, it is possible to downgrade, in a rolling fashion, the upgraded machines back to the old software release. Same as before, suppose *NN1* and *NN2* are respectively in active and standby states. http://git-wip-us.apache.org/repos/asf/hadoop/blob/e216e8e2/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/LibHdfs.md ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/LibHdfs.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/LibHdfs.md index 7b869c8..2697cde 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/LibHdfs.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/LibHdfs.md @@ -76,7 +76,7 @@ libdhfs is thread safe. * Concurrency and Hadoop FS "handles" - The Hadoop FS implementation includes a FS handle cache which + The Hadoop FS implementation includes an FS handle cache which caches based on the URI of the namenode along with the user connecting. So, all calls to `hdfsConnect` will return the same handle but calls to `hdfsConnectAsUser` with different users will http://git-wip-us.apache.org/repos/asf/hadoop/blob/e216e8e2/hadoop-yarn-project/hadoop-yarn/dev-support/jdiff/Apache_Hadoop_YARN_API_2.6.0.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/dev-support/jdiff/Apache_Hadoop_YARN_API_2.6.0.xml b/hadoop-yarn-project/hadoop-yarn/dev-support/jdiff/Apache_Hadoop_YARN_API_2.6.0.xml index 5d58600..a03d7a7 100644 --- a/hadoop-yarn-project/hadoop-yarn/dev-support/jdiff/Apache_Hadoop_YARN_API_2.6.0.xml +++ b/hadoop-yarn-project/hadoop-yarn/dev-support/jdiff/Apache_Hadoop_YARN_API_2.6.0.xml @@ -9801,7 +9801,7 @@ <param name="defaultPort" type="int"/> <doc> <