From 4aae2d40a3e2e732e09b4b8a82623cacc0dc8861 Mon Sep 17 00:00:00 2001 From: Brahma Reddy Battula Date: Thu, 11 May 2017 23:33:45 +0530 Subject: [PATCH] HADOOP-14410. Correct spelling of 'beginning' and variants. Contributed By Dongtao Zhang --- .../java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java | 2 +- .../src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java | 2 +- .../hadoop/security/JniBasedUnixGroupsNetgroupMapping.java | 2 +- .../hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java | 2 +- .../capacity/QueuePriorityContainerCandidateSelector.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java index fe2f8a9dd6..8b90f533f8 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java @@ -135,7 +135,7 @@ public URI getUri() { /** * Strip out the root from the path. * @param p - fully qualified path p - * @return - the remaining path without the begining / + * @return - the remaining path without the beginning / * @throws IOException if the p is not prefixed with root */ String stripOutRoot(final Path p) throws IOException { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java index ad1f5b5620..6168df0d09 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFs.java @@ -132,7 +132,7 @@ public URI getUri() { * Strip out the root from the path. * * @param p - fully qualified path p - * @return - the remaining path without the begining / + * @return - the remaining path without the beginning / */ public String stripOutRoot(final Path p) { try { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java index fc3c4a7f47..ff4ab989e7 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.java @@ -112,7 +112,7 @@ public void cacheGroupsAdd(List groups) throws IOException { protected synchronized List getUsersForNetgroup(String netgroup) { String[] users = null; try { - // JNI code does not expect '@' at the begining of the group name + // JNI code does not expect '@' at the beginning of the group name users = getUsersForNetgroupJNI(netgroup.substring(1)); } catch (Exception e) { if (LOG.isDebugEnabled()) { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java index 0ee1c60c59..4aa4e9f55b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java @@ -133,7 +133,7 @@ protected String execShellGetUserForNetgroup(final String netgroup) throws IOException { String result = ""; try { - // shell command does not expect '@' at the begining of the group name + // shell command does not expect '@' at the beginning of the group name result = Shell.execCommand( Shell.getUsersForNetgroupCommand(netgroup.substring(1))); } catch (ExitCodeException e) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java index 438bce9572..c730a2d88e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/QueuePriorityContainerCandidateSelector.java @@ -425,7 +425,7 @@ public Map> selectCandidates( long currentTime = System.currentTimeMillis(); - // From the begining of the list + // From the beginning of the list for (RMContainer reservedContainer : reservedContainers) { // Only try to preempt reserved container after reserved container created // and cannot be allocated after minTimeout