From 9cba7c6d718a2dc2e786d8abb77d4b6701173adc Mon Sep 17 00:00:00 2001 From: Robert Kanter Date: Wed, 7 Dec 2016 15:07:25 -0800 Subject: [PATCH] YARN-5963. Spelling errors in logging and exceptions for node manager, client, web-proxy, common, and app history code (gsohn via rkanter) (cherry picked from commit 72fe54684198b7df5c5fb2114616dff6d17a4402) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/api/impl/TimelineClientImpl.java --- .../main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java | 2 +- .../java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java | 2 +- .../src/main/java/org/apache/hadoop/yarn/util/FSDownload.java | 2 +- .../hadoop/registry/client/impl/zk/RegistrySecurity.java | 2 +- .../ApplicationHistoryManagerOnTimelineStore.java | 2 +- .../server/nodemanager/WindowsSecureContainerExecutor.java | 4 ++-- .../yarn/server/nodemanager/containermanager/AuxServices.java | 4 ++-- .../nodemanager/containermanager/ContainerManagerImpl.java | 2 +- .../localizer/ResourceLocalizationService.java | 2 +- .../containermanager/logaggregation/AppLogAggregatorImpl.java | 2 +- .../org/apache/hadoop/yarn/server/webproxy/ProxyUriUtils.java | 2 +- .../org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java index d2d9051e34e..8963d34e3cb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java @@ -240,7 +240,7 @@ private int runCommand(String[] args) throws Exception { if (appState == YarnApplicationState.NEW || appState == YarnApplicationState.NEW_SAVING || appState == YarnApplicationState.SUBMITTED) { - System.err.println("Logs are not avaiable right now."); + System.err.println("Logs are not available right now."); return -1; } } catch (IOException | YarnException e) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java index 7779ddf1ccb..2508c3e759d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java @@ -379,7 +379,7 @@ private int refreshNodes(int timeout, String trackingMode) } if (nodesDecommissioning) { System.out.println("Graceful decommissioning not completed in " + timeout - + " seconds, issueing forceful decommissioning command."); + + " seconds, issuing forceful decommissioning command."); RefreshNodesRequest forcefulRequest = RefreshNodesRequest .newInstance(DecommissionType.FORCEFUL); adminProtocol.refreshNodes(forcefulRequest); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java index de18dc63d5a..f34c16c997f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/FSDownload.java @@ -259,7 +259,7 @@ private Path copy(Path sCopy, Path dstdir) throws IOException { if (resource.getVisibility() == LocalResourceVisibility.PUBLIC) { if (!isPublic(sourceFs, sCopy, sStat, statCache)) { throw new IOException("Resource " + sCopy + - " is not publicly accessable and as such cannot be part of the" + + " is not publicly accessible and as such cannot be part of the" + " public cache."); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java index 49673fced3b..3d3e8116f7e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java @@ -356,7 +356,7 @@ public boolean isSecureRegistry() { * @return the system principals */ public List getSystemACLs() { - Preconditions.checkNotNull(systemACLs, "registry security is unitialized"); + Preconditions.checkNotNull(systemACLs, "registry security is uninitialized"); return Collections.unmodifiableList(systemACLs); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java index 3a11c92f600..d47c43a97a7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java @@ -721,7 +721,7 @@ private void checkAccess(ApplicationReportExt app) app.appReport.getApplicationId())) { throw new AuthorizationException("User " + UserGroupInformation.getCurrentUser().getShortUserName() - + " does not have privilage to see this application " + + " does not have privilege to see this application " + app.appReport.getApplicationId()); } } finally { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java index 9e38151cefb..7c124c3700a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java @@ -509,7 +509,7 @@ public void run() { output.append(buf, 0, nRead); } } catch (Throwable t) { - LOG.error("Error occured reading the process stdout", t); + LOG.error("Error occurred reading the process stdout", t); } } }; @@ -722,7 +722,7 @@ public void startLocalizer(LocalizerStartContext ctx) throws IOException, } catch(Throwable e) { LOG.warn(String.format( - "An exception occured during the cleanup of localizer job %s:%n%s", + "An exception occurred during the cleanup of localizer job %s:%n%s", localizerPid, org.apache.hadoop.util.StringUtils.stringifyException(e))); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java index 171b20d4534..c0e1f5a1284 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java @@ -146,7 +146,7 @@ public void serviceInit(Configuration conf) throws Exception { } // TODO better use s.getName()? if(!sName.equals(s.getName())) { - LOG.warn("The Auxilurary Service named '"+sName+"' in the " + LOG.warn("The Auxiliary Service named '"+sName+"' in the " +"configuration is for "+s.getClass()+" which has " +"a name of '"+s.getName()+"'. Because these are " +"not the same tools trying to send ServiceData and read " @@ -283,4 +283,4 @@ private void logWarningWhenAuxServiceThrowExceptions(AuxiliaryService service, : "The auxService name is " + service.getName()) + " and it got an error at event: " + eventType, th); } -} \ No newline at end of file +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java index f8eebca5c7d..b4e67257934 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/ContainerManagerImpl.java @@ -1576,7 +1576,7 @@ private Container preReInitializeOrLocalizeCheck(ContainerId containerId, authorizeUser(remoteUgi, nmTokenIdentifier); if (!nmTokenIdentifier.getApplicationAttemptId().getApplicationId() .equals(containerId.getApplicationAttemptId().getApplicationId())) { - throw new YarnException("ApplicationMaster not autorized to perform " + + throw new YarnException("ApplicationMaster not authorized to perform " + "["+ op + "] on Container [" + containerId + "]!!"); } Container container = context.getContainers().get(containerId); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java index 71971c757de..e4d74f65166 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java @@ -1128,7 +1128,7 @@ LocalizerHeartbeatResponse processHeartbeat( LOG.error("local path for PRIVATE localization could not be " + "found. Disks might have failed.", e); } catch (IllegalArgumentException e) { - LOG.error("Inorrect path for PRIVATE localization." + LOG.error("Incorrect path for PRIVATE localization." + next.getResource().getFile(), e); } catch (URISyntaxException e) { LOG.error( diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java index 872b805c223..07275b13469 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java @@ -494,7 +494,7 @@ public void run() { doAppLogAggregation(); } catch (Exception e) { // do post clean up of log directories on any exception - LOG.error("Error occured while aggregating the log for the application " + LOG.error("Error occurred while aggregating the log for the application " + appId, e); doAppLogAggregationPostCleanUp(); } finally { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/ProxyUriUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/ProxyUriUtils.java index c6567428ea6..f25f4c7bb72 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/ProxyUriUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/ProxyUriUtils.java @@ -49,7 +49,7 @@ public class ProxyUriUtils { private static String uriEncode(Object o) { try { - assert (o != null) : "o canot be null"; + assert (o != null) : "o cannot be null"; return URLEncoder.encode(o.toString(), "UTF-8"); } catch (UnsupportedEncodingException e) { //This should never happen diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java index 5935327759c..71679ccca91 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java @@ -62,7 +62,7 @@ protected void serviceInit(Configuration conf) throws Exception { } else if ("kerberos".equals(auth)) { isSecurityEnabled = true; } else { - LOG.warn("Unrecongized attribute value for " + + LOG.warn("Unrecognized attribute value for " + CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION + " of " + auth); }