diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationMasterProtocol.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationMasterProtocol.java index 4d7896115e77a658c85a798be032b2e71cb3ce42..34b67a77193d9f183343c1894dafc6ad2eac5bf7 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationMasterProtocol.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ApplicationMasterProtocol.java @@ -70,7 +70,7 @@ * * @param request * registration request - * @return registration respose + * @return registration response * @throws YarnException * @throws IOException * @throws InvalidApplicationMasterRequestException diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ContainerManagementProtocol.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ContainerManagementProtocol.java index 7aa43dfb83fdd7c021131846b4a60316f69db0cf..9ad24c30f9e601eeb9ac474afdcd047ee0f76899 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ContainerManagementProtocol.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/ContainerManagementProtocol.java @@ -84,7 +84,7 @@ * * @param request * request to start a list of containers - * @return response including conatinerIds of all successfully launched + * @return response including containerIds of all successfully launched * containers, a containerId-to-exception map for failed requests and * a allServicesMetaData map. * @throws YarnException diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptId.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptId.java index 3ce91a826b07d33daeedcc59e46705131bf21471..0445b837e5eecb17bf10f501167135573044089a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptId.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptId.java @@ -56,8 +56,8 @@ public static ApplicationAttemptId newInstance(ApplicationId appId, } /** - * Get the ApplicationId of the ApplicationAttempId. - * @return ApplicationId of the ApplicationAttempId + * Get the ApplicationId of the ApplicationAttemptId. + * @return ApplicationId of the ApplicationAttemptId */ @Public @Stable diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptReport.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptReport.java index 579705842eaba199f3d48b79ded7680047a52ee3..0410b0fa38d2314e35ff570275b19d73cb11fd77 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptReport.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationAttemptReport.java @@ -115,10 +115,10 @@ public abstract void setYarnApplicationAttemptState( public abstract void setHost(String host); /** - * Get the diagnositic information of the application attempt in case + * Get the diagnostic information of the application attempt in case * of errors. * - * @return diagnositic information of the application attempt in case + * @return diagnostic information of the application attempt in case * of errors */ @Public diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationReport.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationReport.java index 444a202e12fd5ab83ee7fd90105f84ac8deb70f7..a03eaf49f3a3a508c6faf20818dac923cfbb366f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationReport.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationReport.java @@ -226,9 +226,9 @@ public static ApplicationReport newInstance(ApplicationId applicationId, public abstract void setYarnApplicationState(YarnApplicationState state); /** - * Get the diagnositic information of the application in case of + * Get the diagnostic information of the application in case of * errors. - * @return diagnositic information of the application in case + * @return diagnostic information of the application in case * of errors */ @Public diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java index 21cd1bbe8854746e615138d13903e4141790752b..af7568f105a3f0366a35e3edcf7ed56502629f4b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationSubmissionContext.java @@ -430,7 +430,7 @@ public abstract void setKeepContainersAcrossApplicationAttempts( /** * Get node-label-expression for this app. If this is set, all containers of - * this application without setting node-label-expression in ResurceRequest + * this application without setting node-label-expression in ResourceRequest * will get allocated resources on only those nodes that satisfy this * node-label-expression. * diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/DecommissionType.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/DecommissionType.java index 988fd51ed08166ec6fbc9b34f1f9563130ed10ec..fe7fceaac3affed27d418fddfe12dc0880843f87 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/DecommissionType.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/DecommissionType.java @@ -18,7 +18,7 @@ package org.apache.hadoop.yarn.api.records; public enum DecommissionType { - /** Decomissioning nodes in normal way **/ + /** Decommissioning nodes in normal way **/ NORMAL, /** Graceful decommissioning of nodes **/ diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NMToken.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NMToken.java index ea8bec2e8d724994888bd801c2f1620b02639439..36a868bc9e6b2c8978c7c5692442f3bc73344f01 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NMToken.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/NMToken.java @@ -28,9 +28,10 @@ /** *

The NMToken is used for authenticating communication with * NodeManager

- *

It is issued by ResourceMananger when ApplicationMaster - * negotiates resource with ResourceManager and - * validated on NodeManager side.

+ *

It is issued by ResourceManager when + * ApplicationMaster negotiates resource with + * ResourceManager and validated on NodeManager + * side.

* @see AllocateResponse#getNMTokens() */ @Public diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ReservationRequestInterpreter.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ReservationRequestInterpreter.java index 3b826263c770d9771ce7dd2b85aa9a98aa430755..08bebb067673566780a0c21ef556d7dcde0ef03b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ReservationRequestInterpreter.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ReservationRequestInterpreter.java @@ -77,7 +77,7 @@ * placed, but it also imposes a time ordering on the allocations used. This * is important if the ReservationDefinition(s) are used to describe a * workflow with inherent inter-stage dependencies. For example, a first job - * runs in a ReservaitonDefinition R1 (10 x {@literal <1GB,1core>} + * runs in a ReservationDefinition R1 (10 x {@literal <1GB,1core>} * for 20min), and its output is consumed by a second job described by * a ReservationDefinition R2 (5 x {@literal <1GB,1core>}) for 50min). * R2 allocation cannot overlap R1, as R2 models a job depending on diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/HAUtil.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/HAUtil.java index 8c5d00b3f7bdd98ef5ab4ea03a0f6682658e5440..fb4308fb09399569679c671577406a2ea6f97e64 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/HAUtil.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/HAUtil.java @@ -94,7 +94,7 @@ private static void verifyAndSetRMHAIdsList(Configuration conf) { throwBadConfigurationException( getInvalidValueMessage(YarnConfiguration.RM_HA_IDS, conf.get(YarnConfiguration.RM_HA_IDS) + - "\nHA mode requires atleast two RMs")); + "\nHA mode requires at least two RMs")); } StringBuilder setValue = new StringBuilder(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 6b660f713b4b48227483de10fb1128a9b015d17e..24b0a89214deab2922acc0578e4a789ba7051b38 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -106,8 +106,8 @@ private static void addDeprecatedKeys() { public static final String DEFAULT_IPC_SERVER_FACTORY_CLASS = "org.apache.hadoop.yarn.factories.impl.pb.RpcServerFactoryPBImpl"; - /** Factory to create serializeable records.*/ - public static final String IPC_RECORD_FACTORY_CLASS = + /** Factory to create serializable records.*/ + public static final String IPC_RECORD_FACTORY_CLASS = IPC_PREFIX + "record.factory.class"; public static final String DEFAULT_IPC_RECORD_FACTORY_CLASS = "org.apache.hadoop.yarn.factories.impl.pb.RecordFactoryPBImpl"; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java index b28c0c925c3d9128625edf1fd083ceb77c2d402d..8c5e2fd2cc6b9c8afd1bc85e4605c5b734aa687d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java @@ -1020,7 +1020,7 @@ public void run() { vargs.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stdout"); vargs.add("2>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stderr"); - // Get final commmand + // Get final command StringBuilder command = new StringBuilder(); for (CharSequence str : vargs) { command.append(str).append(" "); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java index 5a90880ee85491359376b928076df91b2f9b411d..4003720f326ddfa05cda45e4da728f1efdcbcfde 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/Client.java @@ -641,7 +641,7 @@ public boolean run() throws IOException, YarnException { vargs.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/AppMaster.stdout"); vargs.add("2>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/AppMaster.stderr"); - // Get final commmand + // Get final command StringBuilder command = new StringBuilder(); for (CharSequence str : vargs) { command.append(str).append(" "); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShellWithNodeLabels.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShellWithNodeLabels.java index b62b09122d5117ef55a41582b02bf6c1f4d82d55..98c5c5c4ccab13ed355f3c5b10202c2b82f0618a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShellWithNodeLabels.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShellWithNodeLabels.java @@ -124,7 +124,7 @@ public void testDSShellWithNodeLabelExpression() throws Exception { int[] maxRunningContainersOnNMs = mon.getMaxRunningContainersReport(); // Check no container allocated on NM[0] Assert.assertEquals(0, maxRunningContainersOnNMs[0]); - // Check there're some containers allocated on NM[1] + // Check there are some containers allocated on NM[1] Assert.assertTrue(maxRunningContainersOnNMs[1] > 0); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java index b1324c1d7b0a19c93756956b603204931f32b613..3e3efcf0e3d922bf0137eb7048ef8ced079bc2c9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java @@ -320,13 +320,13 @@ public AllocateResponse allocate(float progressIndicator) // preserve ask and release for next call to allocate() synchronized (this) { release.addAll(releaseList); - // requests could have been added or deleted during call to allocate + // Requests could have been added or deleted during call to allocate. // If requests were added/removed then there is nothing to do since // the ResourceRequest object in ask would have the actual new value. // If ask does not have this ResourceRequest then it was unchanged and // so we can add the value back safely. // This assumes that there will no concurrent calls to allocate() and - // so we dont have to worry about ask being changed in the + // so we don't have to worry about ask being changed in the // synchronized block at the beginning of this method. for(ResourceRequest oldAsk : askList) { if(!ask.contains(oldAsk)) { @@ -397,7 +397,7 @@ public void unregisterApplicationMaster(FinalApplicationStatus appStatus, @Override public synchronized void addContainerRequest(T req) { Preconditions.checkArgument(req != null, - "Resource request can not be null."); + "Resource request cannot be null."); Set dedupedRacks = new HashSet(); if (req.getRacks() != null) { dedupedRacks.addAll(req.getRacks()); @@ -457,7 +457,7 @@ public synchronized void addContainerRequest(T req) { @Override public synchronized void removeContainerRequest(T req) { Preconditions.checkArgument(req != null, - "Resource request can not be null."); + "Resource request cannot be null."); Set allRacks = new HashSet(); if (req.getRacks() != null) { allRacks.addAll(req.getRacks()); @@ -482,7 +482,7 @@ public synchronized void removeContainerRequest(T req) { @Override public synchronized void releaseAssignedContainer(ContainerId containerId) { Preconditions.checkArgument(containerId != null, - "ContainerId can not be null."); + "ContainerId cannot be null."); pendingRelease.add(containerId); release.add(containerId); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java index 25481f876066956174f138b011265e6b386bb867..ee551c3e7a0be8fd5212d06eac96b34e5607fd59 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java @@ -211,7 +211,7 @@ public int run(String[] args) throws Exception { if (appState == YarnApplicationState.NEW || appState == YarnApplicationState.NEW_SAVING || appState == YarnApplicationState.SUBMITTED) { - System.out.println("Logs are not avaiable right now."); + System.out.println("Logs are not available right now."); return -1; } } catch (IOException | YarnException e) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java index 36d29d658953ff564c854372d25928e0a596e983..e83f0269c59ae4ca6ad2db96197dfd14153d5ba0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java @@ -427,13 +427,13 @@ private int getGroups(String[] usernames) throws IOException { if ((leftParenthesisIdx == -1 && rightParenthesisIdx != -1) || (leftParenthesisIdx != -1 && rightParenthesisIdx == -1)) { - // Parenthese not match + // Parentheses not match throw new IllegalArgumentException(ADD_LABEL_FORMAT_ERR_MSG); } if (leftParenthesisIdx > 0 && rightParenthesisIdx > 0) { if (leftParenthesisIdx > rightParenthesisIdx) { - // Parentese not match + // Parentheses not match throw new IllegalArgumentException(ADD_LABEL_FORMAT_ERR_MSG); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java index 7d29d0529272a502e205ff92b55e38ad3aa65e3a..cd4cbac3d986219183549fb1e524e57eac40b374 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java @@ -1005,7 +1005,7 @@ public ApplicationMasterProtocol run() { }).allocate(request); // Make sure previous token has been rolled-over - // and can not use this rolled-over token to make a allocate all. + // and cannot use this rolled-over token to make a allocate all. while (true) { if (amrmToken_2.decodeIdentifier().getKeyId() != amrmTokenSecretManager .getCurrnetMasterKeyData().getMasterKey().getKeyId()) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java index 7d20cf2e5a40b5f0f61d11245a9e0da5d04c1d2e..1f4ed4ea619532492be70e64f57fc9b567a6b42c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestLogsCLI.java @@ -92,12 +92,12 @@ public void testFailResultCodes() throws Exception { LogsCLI dumper = new LogsCLIForTest(mockYarnClient); dumper.setConf(conf); - // verify dumping a non-existent application's logs returns a failure code + // verify dumping a nonexistent application's logs returns a failure code int exitCode = dumper.run( new String[] { "-applicationId", "application_0_0" } ); assertTrue("Should return an error code", exitCode != 0); - // verify dumping a non-existent container log is a failure code + // verify dumping a nonexistent container log is a failure code exitCode = cliHelper.dumpAContainersLogs("application_0_0", "container_0_0", "nonexistentnode:1234", "nobody"); assertTrue("Should return an error code", exitCode != 0); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java index 28628f32a47663bb0dcada8116f7d6d6b6267dd6..261d115323b62fae6442b515b68fd79c5a394ab5 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java @@ -185,7 +185,7 @@ public static RetryPolicy createRetryPolicy(Configuration conf) { if (rmConnectWaitMS < 0) { throw new YarnRuntimeException("Invalid Configuration. " + YarnConfiguration.RESOURCEMANAGER_CONNECT_MAX_WAIT_MS - + " can be -1, but can not be other negative numbers"); + + " can be -1, but cannot be other negative numbers"); } // try connect once diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java index c54b9c707aa5b59774d3dba1651c35ee1b0e0133..aed1aafcdc93b72d4762a9744a7c16dcdf117d54 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/event/AsyncDispatcher.java @@ -137,7 +137,7 @@ public void setDrainEventsOnStop() { protected void serviceStop() throws Exception { if (drainEventsOnStop) { blockNewEvents = true; - LOG.info("AsyncDispatcher is draining to stop, igonring any new events."); + LOG.info("AsyncDispatcher is draining to stop, ignoring any new events."); synchronized (waitForDrained) { while (!drained && eventHandlingThread.isAlive()) { waitForDrained.wait(1000); @@ -162,7 +162,7 @@ protected void serviceStop() throws Exception { @SuppressWarnings("unchecked") protected void dispatch(Event event) { - //all events go thru this loop + //all events go through this loop if (LOG.isDebugEnabled()) { LOG.debug("Dispatching the event " + event.getClass().getName() + "." + event.toString()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java index 7b2c35cafdb1dae412dd4da73362a1eb109a5c9f..47c6267727d1b9e8845c120f17e836c83a82b2e0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/YarnAuthorizationProvider.java @@ -54,7 +54,7 @@ public static YarnAuthorizationProvider getInstance(Configuration conf) { (YarnAuthorizationProvider) ReflectionUtils.newInstance( authorizerClass, conf); authorizer.init(conf); - LOG.info(authorizerClass.getName() + " is instiantiated."); + LOG.info(authorizerClass.getName() + " is instantiated."); } } return authorizer; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/sharedcache/SharedCacheChecksum.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/sharedcache/SharedCacheChecksum.java index 7e6fddaa2635d60b4d6ffe6d6053b12cafbd7413..4a62da25f24370bf25a9591bf41b463a942cd324 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/sharedcache/SharedCacheChecksum.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/sharedcache/SharedCacheChecksum.java @@ -35,7 +35,7 @@ /** * Calculate the checksum of the passed input stream. * - * @param in InputStream to be checksumed + * @param in InputStream to be checksummed * @return the message digest of the input stream * @throws IOException */ diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceCalculator.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceCalculator.java index 442196cb4808b9d158c9ad1324bb127c43649c8f..dd3c4ce22371e0bda6ff4106ab1f60c7dcd7a8b9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceCalculator.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/ResourceCalculator.java @@ -99,7 +99,7 @@ public Resource normalize(Resource r, Resource minimumResource, /** * Normalize resource r given the base * minimumResource and verify against max allowed - * maximumResource using a step factor for hte normalization. + * maximumResource using a step factor for the normalization. * * @param r resource * @param minimumResource minimum value diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfiguration.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfiguration.java index 1f10810494e1f732f243822ebc085a0140f219bd..89eb35916e3737b0922fb2e870aab18006cadbf1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfiguration.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfiguration.java @@ -37,7 +37,7 @@ public void testDefaultRMWebUrl() throws Exception { YarnConfiguration conf = new YarnConfiguration(); String rmWebUrl = WebAppUtils.getRMWebAppURLWithScheme(conf); - // shouldn't have a "/" on the end of the url as all the other uri routinnes + // shouldn't have a "/" on the end of the url as all the other uri routines // specifically add slashes and Jetty doesn't handle double slashes. Assert.assertNotSame("RM Web Url is not correct", "http://0.0.0.0:8088", rmWebUrl); @@ -53,7 +53,7 @@ public void testRMWebUrlSpecified() throws Exception { conf.set(YarnConfiguration.RM_ADDRESS, "rmtesting:9999"); String rmWebUrl = WebAppUtils.getRMWebAppURLWithScheme(conf); String[] parts = rmWebUrl.split(":"); - Assert.assertEquals("RM Web URL Port is incrrect", 24543, + Assert.assertEquals("RM Web URL Port is incorrect", 24543, Integer.valueOf(parts[parts.length - 1]).intValue()); Assert.assertNotSame( "RM Web Url not resolved correctly. Should not be rmtesting", diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java index 59cef07d28cc15a431a5771b07dbb0e3793f0bc5..7cf6bae92dba7455fb9a3c5cdfa435bc4a27e6a5 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java @@ -256,7 +256,7 @@ protected void destroyProcessTree(String pid) throws IOException { * @param pidFileName * Name of the pid-file. * @return the PID string read from the pid-file. Returns null if the - * pidFileName points to a non-existing file or if read fails from the + * pidFileName points to a nonexistent file or if read fails from the * file. */ public static String getPidFromPidFile(String pidFileName) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/MyTestJAXBContextResolver.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/MyTestJAXBContextResolver.java index 6f6ee5d4b53abd76ba0cfdffd66e67d9e8c5e3f1..92b6a1734e897cc00493a2973be8d230c54bde88 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/MyTestJAXBContextResolver.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/MyTestJAXBContextResolver.java @@ -9,7 +9,7 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by joblicable law or agreed to in writing, software + * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and @@ -53,4 +53,4 @@ public MyTestJAXBContextResolver() throws Exception { public JAXBContext getContext(Class objectType) { return (types.contains(objectType)) ? context : null; } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/MyTestWebService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/MyTestWebService.java index f37b01a1462542e5704e03fd452a6093476a65da..2cc459b3ef3f8fbb82e71ce66a589ad257770d7a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/MyTestWebService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/MyTestWebService.java @@ -9,7 +9,7 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by joblicable law or agreed to in writing, software + * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and @@ -44,4 +44,4 @@ public MyInfo() { } } -} \ No newline at end of file +} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java index 6eaeb2b0c13c1e99f4cf7b8af23f957441d30315..27620d02998dad4bae726469ff6bf054e9930c89 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/TestWebApp.java @@ -274,7 +274,7 @@ public void setup() { try { // should not redirect to foo assertFalse("foo".equals(getContent(baseUrl +"static").trim())); - // Not able to access a non-existing dir, should not redirect to foo. + // Not able to access a nonexistent dir, should not redirect to foo. assertEquals(404, getResponseCode(baseUrl +"logs")); // should be able to redirect to foo. assertEquals("foo", getContent(baseUrl).trim()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryConstants.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryConstants.java index a6fe216ec91ff0b18661ee542d4318d5a3ccfe1b..24130be6633007bd258b0eb0c3fb4e2a0d7bfede 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryConstants.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryConstants.java @@ -50,7 +50,7 @@ String KEY_REGISTRY_ENABLED = REGISTRY_PREFIX + "rm.enabled"; /** - * Defaut value for enabling the registry in the RM: {@value} + * Default value for enabling the registry in the RM: {@value} */ boolean DEFAULT_REGISTRY_ENABLED = false; @@ -123,7 +123,7 @@ * Registry client authentication password. *

* This is only used in secure clusters with the client set to - * use digest (not SASL or anonymouse) authentication. + * use digest (not SASL or anonymous) authentication. *

* Specifically, {@link #KEY_REGISTRY_CLIENT_AUTH} set to * {@link #REGISTRY_CLIENT_AUTH_DIGEST} diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/JsonSerDeser.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/JsonSerDeser.java index af4e4f409c0c0dd53766749d01c9e98526f17d73..55f597a14ba54cda5203ebfa8cd2cde7ace76ddb 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/JsonSerDeser.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/JsonSerDeser.java @@ -201,7 +201,7 @@ public void save(FileSystem fs, Path path, T instance, /** * Write the json as bytes -then close the file - * @param dataOutputStream an outout stream that will always be closed + * @param dataOutputStream an output stream that will always be closed * @throws IOException on any failure */ private void writeJsonAsBytes(T instance, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryTypeUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryTypeUtils.java index ec59d5985a0446e54a254a58562fbde9b9741106..23aeae42f02c203076b1f9af432c2a6a7044fd3b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryTypeUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryTypeUtils.java @@ -219,7 +219,7 @@ public static String getAddressField(Map address, } /** - * Get the address URLs. Guranteed to return at least one address. + * Get the address URLs. Guaranteed to return at least one address. * @param epr endpoint * @return the address as a URL * @throws InvalidRecordException if the type is wrong, there are no addresses diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryUtils.java index 858b6b123570e0b7bea9045810b3f73fbb7e6c3d..de510dcebf196fd1c252ecc1420567ec11e9feab 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryUtils.java @@ -56,7 +56,7 @@ LoggerFactory.getLogger(RegistryUtils.class); /** - * Buld the user path -switches to the system path if the user is "". + * Build the user path -switches to the system path if the user is "". * It also cross-converts the username to ascii via punycode * @param username username or "" * @return the path to the user @@ -186,7 +186,7 @@ public static String componentPath(String user, * This is not an atomic operation; A child may be deleted * during the iteration through the child entries. If this happens, * the PathNotFoundException is caught and that child - * entry ommitted. + * entry omitted. * * @param path path * @return a possibly empty map of child entries listed by @@ -256,7 +256,7 @@ private static String currentUsernameUnencoded() { * This ensures that the username propagates correctly across processes * started by YARN. *

- * This method is primarly made visible for testing. + * This method is primarily made visible for testing. * @param env_hadoop_username the environment variable * @return the selected username * @throws RuntimeException if there is a problem getting the short user diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/CuratorService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/CuratorService.java index 7f35c3fe62843e1109051b00031eb33dc6ea5e89..029ef378c9b169cbd2248ec7706cab1bf61d59a2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/CuratorService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/CuratorService.java @@ -141,7 +141,7 @@ protected void serviceInit(Configuration conf) throws Exception { registryRoot = conf.getTrimmed(KEY_REGISTRY_ZK_ROOT, DEFAULT_ZK_REGISTRY_ROOT); - // create and add the registy service + // create and add the registry service registrySecurity = new RegistrySecurity("registry security"); addService(registrySecurity); @@ -189,7 +189,7 @@ private void checkServiceLive() throws ServiceStateException { /** * Flag to indicate whether or not the registry is secure. - * Valid once the service is inited. + * Valid once the service is initialized. * @return service security policy */ public boolean isSecure() { @@ -290,7 +290,7 @@ public String bindingDiagnosticDetails() { * Create a full path from the registry root and the supplied subdir * @param path path of operation * @return an absolute path - * @throws IllegalArgumentException if the path is invalide + * @throws IllegalArgumentException if the path is invalid */ protected String createFullPath(String path) throws IOException { return RegistryPathUtils.createFullPath(registryRoot, path); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java index 1c75e43987e8c1d7f68c049190a74dafcf26d9c2..1dd4450fd8126a97e47c31a584e349afea2e0ede 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java @@ -356,7 +356,8 @@ 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); } @@ -917,7 +918,7 @@ public static String getDefaultRealmInJVM() { /** * Create an ACL For a user. * @param ugi User identity - * @return the ACL For the specified user. Ifthe username doesn't end + * @return the ACL For the specified user. If the username doesn't end * in "@" then the realm is added */ public ACL createACLForUser(UserGroupInformation ugi, int perms) { @@ -949,7 +950,7 @@ public ACL createACLfromUsername(String username, int perms) { } /** - * On demand string-ifier for UGI with extra details + * On demand stringifier for UGI with extra details */ public static class UgiInfo { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZKPathDumper.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZKPathDumper.java index 3c4a730608f6ee5aa45bd49ae05fa60769bab2b9..62e3afb5ec893c70c24b5b23f41fd8690b1b36b1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZKPathDumper.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZKPathDumper.java @@ -123,7 +123,7 @@ private void expand(StringBuilder builder, * Append the specified indentation to a builder * @param builder string build to append to * @param indent current indentation - * @param c charactor to use for indentation + * @param c character to use for indentation */ private void append(StringBuilder builder, int indent, char c) { for (int i = 0; i < indent; i++) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/AddingCompositeService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/AddingCompositeService.java index 9faede49dc56588db9b4d64df41d1371a04ea401..4c75d94eb04cffbc1732fe1d933cd2bd6288315a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/AddingCompositeService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/AddingCompositeService.java @@ -27,12 +27,12 @@ * Composite service that exports the add/remove methods. *

* This allows external classes to add services to these methods, after which - * they follow the same lifecyce. + * they follow the same lifecycle. *

* It is essential that any service added is in a state where it can be moved - * on with that of the parent services. Specifically, do not add an uninited - * service to a parent that is already inited —as the start - * operation will then fail + * on with that of the parent services. Specifically, do not add an + * uninitialized service to a parent that is already initialized, as the + * start operation will then fail * */ @InterfaceAudience.Public diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java index 88e9d67b79d72b1baf8de64526e51789d2bba9e8..7ca2b3288015c3fd928e67aa7ceb214b97abc719 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/MicroZookeeperService.java @@ -173,7 +173,7 @@ private void mkdirStrict(File dir) throws IOException { *

* A newline is appended afterwards. * @param text text including any format commands - * @param args arguments for the forma operation. + * @param args arguments for the format operation. */ protected void addDiagnostics(String text, Object ... args) { diagnostics.append(String.format(text, args)).append('\n'); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java index 513d7ac0aaf5a78ae6ef477173bc194ddd163c3d..7e8423e6ab982e56e094f8eb230d6906ab1c141f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/server/services/RegistryAdminService.java @@ -372,12 +372,12 @@ protected void verifyRealmValidity() throws ServiceStateException { * The code is designed to be robust against parallel deletions taking place; * in such a case it will stop attempting that part of the tree. This * avoid the situation of more than 1 purge happening in parallel and - * one of the purge operations deleteing the node tree above the other. + * one of the purge operations deleting the node tree above the other. * @param path base path * @param selector selector for the purge policy * @param purgePolicy what to do if there is a matching record with children * @param callback optional curator callback - * @return the number of delete operations perfomed. As deletes may be for + * @return the number of delete operations performed. As deletes may be for * everything under a path, this may be less than the number of records * actually deleted * @throws IOException problems diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java index 91602e1d3b3e2263babf124cba66d44421b17e49..e2eca3de16fb013fd26151d9571542ab3c34c56d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java @@ -320,7 +320,7 @@ public static LoginContext logout(LoginContext login) { } /** - * Login via a UGI. Requres UGI to have been set up + * Login via a UGI. Requires UGI to have been set up * @param user username * @param keytab keytab to list * @return the UGI diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/AbstractSecureRegistryTest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/AbstractSecureRegistryTest.java index 14a950d29347d1ab2c4379ef850a619afe3573c7..6b248778ab663c21648a320da3ffa8ed9be3a3ca 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/AbstractSecureRegistryTest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/AbstractSecureRegistryTest.java @@ -55,7 +55,7 @@ import java.util.Set; /** - * Add kerberos tests. This is based on the (JUnit3) KerberosSecurityTestcase + * Add Kerberos tests. This is based on the (JUnit3) KerberosSecurityTestcase * and its test case, TestMiniKdc */ public class AbstractSecureRegistryTest extends RegistryTestHelper { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureRegistry.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureRegistry.java index 083f7f9522a4079f2a1a2c6ac1a29a6db6f9878a..a605c837b8a5bb6637ea0fed4fd255e4466c3451 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureRegistry.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureRegistry.java @@ -142,7 +142,7 @@ public void testZookeeperCanWrite() throws Throwable { * Start a curator service instance * @param name name * @param secure flag to indicate the cluster is secure - * @return an inited and started curator service + * @return an initialized and started curator service */ protected CuratorService startCuratorServiceInstance(String name, boolean secure) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java index c7b19d360f4907b8a777439d3f52160317186e73..04362b330424e60332c3126cc9fb49d5b68af401 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerOnTimelineStore.java @@ -619,7 +619,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 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java index 6d76864b07fc52b5a1baa476466e816f46813412..ada1362414b9e6c9726ecd5c4db8a805be7a5176 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java @@ -405,7 +405,7 @@ public ContainerHistoryData getAMContainer(ApplicationAttemptId appAttemptId) } } } - LOG.info("Completed reading history information of all conatiners" + LOG.info("Completed reading history information of all containers" + " of application attempt " + appAttemptId); } catch (IOException e) { LOG.info("Error when reading history information of some containers" @@ -429,7 +429,7 @@ public void applicationStarted(ApplicationStartData appStart) LOG.info("Opened history file of application " + appStart.getApplicationId()); } catch (IOException e) { - LOG.error("Error when openning history file of application " + LOG.error("Error when opening history file of application " + appStart.getApplicationId(), e); throw e; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptsInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptsInfo.java index ae33b714d6a42b2f80ba33c4ceb083bc288dbddb..8e02866891a7f1a7ee313ef2ab4f809547b60570 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptsInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/dao/AppAttemptsInfo.java @@ -9,7 +9,7 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by joblicable law or agreed to in writing, software + * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestYarnServerApiClasses.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestYarnServerApiClasses.java index d9eeb9db68bb2c44a14753177ef7bffe37afb9ce..057d1d59f6b496c4539858bfff7b3cba1fc6cfd9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestYarnServerApiClasses.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/TestYarnServerApiClasses.java @@ -262,7 +262,7 @@ public void testRegisterNodeManagerRequestWithNullLabels() { NodeId.newInstance("host", 1234), 1234, Resource.newInstance(0, 0), "version", null, null); - // serialze to proto, and get request from proto + // serialize to proto, and get request from proto RegisterNodeManagerRequest request1 = new RegisterNodeManagerRequestPBImpl( ((RegisterNodeManagerRequestPBImpl) request).getProto()); @@ -279,7 +279,7 @@ public void testRegisterNodeManagerRequestWithValidLabels() { NodeId.newInstance("host", 1234), 1234, Resource.newInstance(0, 0), "version", null, null, nodeLabels); - // serialze to proto, and get request from proto + // serialize to proto, and get request from proto RegisterNodeManagerRequest copy = new RegisterNodeManagerRequestPBImpl( ((RegisterNodeManagerRequestPBImpl) request).getProto()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DirectoryCollection.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DirectoryCollection.java index 32046c5fdf792b327811e102249aea7e21d06047..b6e10afd86773b1318bf91ae4d7681f7e15a7dce 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DirectoryCollection.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DirectoryCollection.java @@ -213,7 +213,7 @@ synchronized int getNumFailures() { } /** - * Create any non-existent directories and parent directories, updating the + * Create any nonexistent directories and parent directories, updating the * list of valid directories if necessary. * @param localFs local file system to use * @param perm absolute permissions to use for any directories created diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java index 3721b0e8a12878dc7e41a845be67e7eb95f1581b..d41f0f4b1c55bfac0bae490fd0c7355e972e5f0f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java @@ -335,7 +335,7 @@ protected void registerWithRM() "Message from ResourceManager: " + regNMResponse.getDiagnosticsMessage(); throw new YarnRuntimeException( - "Recieved SHUTDOWN signal from Resourcemanager, Registration of NodeManager failed, " + "Received SHUTDOWN signal from Resourcemanager, Registration of NodeManager failed, " + message); } @@ -409,7 +409,7 @@ protected void registerWithRM() // Remove if the application has finished. i.remove(); } else if (System.currentTimeMillis() > nextKeepAlive) { - // KeepAlive list for the next hearbeat. + // KeepAlive list for the next heartbeat. appList.add(appId); trackAppForKeepAlive(appId); } @@ -684,7 +684,7 @@ public void run() { : nodeLabelsForHeartbeat; if (!areNodeLabelsUpdated(nodeLabelsForHeartbeat, lastUpdatedNodeLabelsToRM)) { - // if nodelabels have not changed then no need to send + // if node labels have not changed then no need to send nodeLabelsForHeartbeat = null; } } @@ -715,7 +715,7 @@ public void run() { if (response.getNodeAction() == NodeAction.SHUTDOWN) { LOG - .warn("Recieved SHUTDOWN signal from Resourcemanager as part of heartbeat," + .warn("Received SHUTDOWN signal from Resourcemanager as part of heartbeat," + " hence shutting down."); LOG.warn("Message from ResourceManager: " + response.getDiagnosticsMessage()); @@ -753,7 +753,7 @@ public void run() { // don't want to remove the completed containers before resync // because these completed containers will be reported back to RM // when NM re-registers with RM. - // Only remove the cleanedup containers that are acked + // Only remove the cleaned up containers that are acked removeOrTrackCompletedContainersFromContext(response .getContainersToBeRemovedFromNM()); @@ -808,7 +808,7 @@ public void run() { } /** - * Caller should take care of sending non null nodelabels for both + * Caller should take care of sending non null node labels for both * arguments * * @param nodeLabelsNew diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java index fd2e31b7b482fd8c446597b89be60bd55edb6c0f..e01cb31d1a9d44ebcee52cd856f4cc2bbd9cbb20 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java @@ -491,7 +491,7 @@ public void validateResult() throws IOException { assertComplete(); if (0 != exitCode) { LOG.warn(output.toString()); - throw new IOException("Processs exit code is:" + exitCode); + throw new IOException("Process exit code is:" + exitCode); } } @@ -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); } } }; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java 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 fb6f79b7c36eb74813c5ba002eb7e03243dcee7f..08c4e6713aa4cb68e42102333883089ad97f908e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java @@ -117,7 +117,7 @@ public void serviceInit(Configuration conf) throws Exception { "The ServiceName: " + sName + " set in " + YarnConfiguration.NM_AUX_SERVICES +" is invalid." + "The valid service name should only contain a-zA-Z0-9_ " + - "and can not start with numbers"); + "and cannot start with numbers"); Class sClass = conf.getClass( String.format(YarnConfiguration.NM_AUX_SERVICE_FMT, sName), null, AuxiliaryService.class); @@ -127,7 +127,7 @@ public void serviceInit(Configuration conf) throws Exception { AuxiliaryService s = ReflectionUtils.newInstance(sClass, conf); // 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 "+sClass+" which has " +"a name of '"+s.getName()+"'. Because these are " +"not the same tools trying to send ServiceData and read " diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java index a73b11303e02097cedf2064f67f9e5a9b8459749..3166844cf89893861d6f2582a57e716fa41c1e6c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/ApplicationImpl.java @@ -404,7 +404,7 @@ public ApplicationState transition(ApplicationImpl app, app.containers.remove(containerFinishEvent.getContainerID()); if (app.containers.isEmpty()) { - // All containers are cleanedup. + // All containers are cleaned up. app.handleAppFinishWithContainersCleanedup(); return ApplicationState.APPLICATION_RESOURCES_CLEANINGUP; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java index 289d6d05ce6629231f3b135f3792ba17df6500bd..232b54c14e00c90214ae9097ad19bc851a714aed 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java @@ -827,7 +827,7 @@ public void transition(ContainerImpl container, ContainerEvent event) { } // TODO: Add containerWorkDir to the deletion service. - // TODO: Add containerOuputDir to the deletion service. + // TODO: Add containerOutputDir to the deletion service. if (clCleanupRequired) { container.dispatcher.getEventHandler().handle( diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/PrivilegedOperationExecutor.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/PrivilegedOperationExecutor.java index 6fe0f5ce47f3d1e5974b5b0a40bacc3776cdd64e..92cc31e520abe68cd6c51ef44d19509c37895abe 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/PrivilegedOperationExecutor.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/PrivilegedOperationExecutor.java @@ -88,7 +88,7 @@ public static PrivilegedOperationExecutor getInstance(Configuration conf) { * prefix commands are necessary * @param operation the type and arguments for the operation to be * executed - * @return execution string array for priviledged operation + * @return execution string array for privileged operation */ public String[] getPrivilegedOperationExecutionCommand(List diff --git 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 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 654eb0b1a52b6db6c7a4123f407e79f2460793c5..fd688eaf9abfd51bd30dea4dca2ae0a7e77d80ca 100644 --- 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 +++ 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 @@ -177,7 +177,7 @@ public AppLogAggregatorImpl(Dispatcher dispatcher, this.rollingMonitorInterval = configuredRollingMonitorInterval; } else { LOG.warn( - "rollingMonitorIntervall should be more than or equal to " + "rollingMonitorInterval should be more than or equal to " + NM_LOG_AGGREGATION_MIN_ROLL_MONITORING_INTERVAL_SECONDS + " seconds. Using " + NM_LOG_AGGREGATION_MIN_ROLL_MONITORING_INTERVAL_SECONDS @@ -189,7 +189,7 @@ public AppLogAggregatorImpl(Dispatcher dispatcher, if (configuredRollingMonitorInterval <= 0) { LOG.warn("rollingMonitorInterval is set as " + configuredRollingMonitorInterval + ". " - + "The log rolling mornitoring interval is disabled. " + + "The log rolling monitoring interval is disabled. " + "The logs will be aggregated after this application is finished."); } else { LOG.warn("rollingMonitorInterval is set as " diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java index c61d1f0944a9281a8c223554a17ecc88e0cb1456..ddfa84e4ee21ca12c45cfdfb724bd2ead5e4ac11 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java @@ -80,7 +80,7 @@ public void testValidPathsDirHandlerService() throws Exception { Assert.fail("Service should have thrown an exception due to wrong URI"); } catch (YarnRuntimeException e) { } - Assert.assertEquals("Service should not be inited", + Assert.assertEquals("Service should not be initialized", STATE.STOPPED, dirSvc.getServiceState()); dirSvc.close(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeHealthService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeHealthService.java index 2e41dea5304009e9c4a9255bd406f69ba515fd4f..4b013495f4379c5348866dcd7e709a6739b818e5 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeHealthService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeHealthService.java @@ -163,7 +163,7 @@ public void testNodeHealthService() throws Exception { LOG.info("Checking Healthy--->timeout"); Assert.assertFalse("Node health status reported healthy even after timeout", healthStatus.getIsNodeHealthy()); - Assert.assertTrue("Node script time out message not propogated", + Assert.assertTrue("Node script time out message not propagated", healthStatus.getHealthReport().equals( NodeHealthScriptRunner.NODE_HEALTH_SCRIPT_TIMED_OUT_MSG + NodeHealthCheckerService.SEPARATOR diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java index bc48adfdea08761dacbab25ea1e77b5bb80d2a35..72b561d1dc47714ca4242a7cbce754505841530f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java @@ -479,7 +479,7 @@ protected NodeStatusUpdater createNodeStatusUpdater(Context context, @Override protected void serviceStop() throws Exception { - System.out.println("Called stooppppp"); + System.out.println("Called stop"); super.serviceStop(); isStopped = true; ConcurrentMap applications = @@ -1226,7 +1226,7 @@ protected NodeStatusUpdater createUpdater(Context context, } }; verifyNodeStartFailure( - "Recieved SHUTDOWN signal from Resourcemanager, " + "Received SHUTDOWN signal from Resourcemanager, " + "Registration of NodeManager failed, " + "Message from ResourceManager: RM Shutting Down Node"); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java index a8e723d2a2e26fd903349319bb0bba17aff5bc9e..42c9259d6d2b52bc38049f51a1e5ccc9d2b6bebc 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java @@ -245,8 +245,8 @@ protected DeletionService createDeletionService() { @Override public void delete(String user, Path subDir, Path... baseDirs) { // Don't do any deletions. - LOG.info("Psuedo delete: user - " + user + ", subDir - " + subDir - + ", baseDirs - " + baseDirs); + LOG.info("Pseudo delete: user - " + user + ", subDir - " + subDir + + ", baseDirs - " + baseDirs); }; }; } @@ -288,7 +288,7 @@ public static void waitForContainerState(ContainerManagementProtocol containerMa containerStatus = containerManager.getContainerStatuses(request).getContainerStatuses().get(0); } LOG.info("Container state is " + containerStatus.getState()); - Assert.assertEquals("ContainerState is not correct (timedout)", + Assert.assertEquals("ContainerState is not correct (timed out)", finalState, containerStatus.getState()); } @@ -307,7 +307,7 @@ static void waitForApplicationState(ContainerManagerImpl containerManager, Thread.sleep(1000); } - Assert.assertTrue("App is not in " + finalState + " yet!! Timedout!!", + Assert.assertTrue("App is not in " + finalState + " yet!! Timed out!!", app.getApplicationState().equals(finalState)); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java index 757cdc8f3ee63471b807d44f51663e25884cbb81..9b71fad7232bb4214dedca5df53f1a6d580d804d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java @@ -325,7 +325,7 @@ public void testValidAuxServiceName() { } catch (Exception ex) { assertTrue(ex.getMessage().contains("The ServiceName: 1Asrv1 set in " + "yarn.nodemanager.aux-services is invalid.The valid service name " + - "should only contain a-zA-Z0-9_ and can not start with numbers")); + "should only contain a-zA-Z0-9_ and cannot start with numbers")); } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java index 7bdfdfb0a252c950894506989a042c5b2299a3ef..bd862032152a50b712e177247a93e0313a81e416 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java @@ -159,7 +159,7 @@ public void testContainerManagerInitialization() throws IOException { Assert.assertEquals(fqdn, context.getNodeId().getHost()); } - // Just do a query for a non-existing container. + // Just do a query for a nonexistent container. boolean throwsException = false; try { List containerIds = new ArrayList(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java index 370a20734f81de69c66f5a350a095c50dc11fa18..1d97e068c47c1377a9b08bbb725cbfe927581cf5 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/application/TestApplication.java @@ -376,7 +376,7 @@ public void testStartContainerAfterAppFinished() { // @Test @SuppressWarnings("unchecked") public void testAppFinishedOnIniting() { - // AM may send a startContainer() - AM APP_FINIHSED processed after + // AM may send a startContainer() - AM APP_FINISHED processed after // APP_FINISHED on another NM WrappedApplication wa = null; try { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java index 285635771f3c4049a6477cb740591c9ba923d573..4c290e05fef9769aa375e84d30f87fba16a56a2b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java @@ -1003,7 +1003,7 @@ public void testWindowsShellScriptBuilderCommand() throws IOException { org.apache.commons.lang.StringUtils.repeat("A", 1024), org.apache.commons.lang.StringUtils.repeat("A", 1024))); - // buildr.command joins the command parts with an extra space + // builder.command joins the command parts with an extra space builder.command(Arrays.asList( org.apache.commons.lang.StringUtils.repeat("E", 4095), org.apache.commons.lang.StringUtils.repeat("E", 2047), diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.java index 7154d03d9310b4a514efd6bf04b2a6cac8dfcdbe..588520ec175d1fbc24354cce26b89653aa951555 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/privileged/TestPrivilegedOperationExecutor.java @@ -221,7 +221,7 @@ public void testSquashCGroupOperationsWithValidOperations() { .append(cGroupTasks2).append(',') .append(cGroupTasks3).toString(); - //We expect axactly one argument + //We expect exactly one argument Assert.assertEquals(1, op.getArguments().size()); //Squashed list of tasks files Assert.assertEquals(expected, op.getArguments().get(0)); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java index ff9b8208884583d36bdafcc71f85637e7beddb12..4401485b9bee7e92ef65210452ee6332341e862e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java @@ -319,7 +319,7 @@ public RegisterApplicationMasterResponse registerApplicationMaster( nmTokens.add(token); } } catch (IllegalArgumentException e) { - // if it's a DNS issue, throw UnknowHostException directly and + // if it's a DNS issue, throw UnknownHostException directly and // that // will be automatically retried by RMProxy in RPC layer. if (e.getCause() instanceof UnknownHostException) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java index e4199be7be29be9fbb052c4f942813bd7d1bc83c..b9b0c34002c058fdd79b6f00264b74db67b6ea46 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java @@ -378,7 +378,7 @@ public GetApplicationAttemptReportResponse getApplicationAttemptReport( response = GetApplicationAttemptReportResponse.newInstance(attemptReport); }else{ throw new YarnException("User " + callerUGI.getShortUserName() - + " does not have privilage to see this attempt " + appAttemptId); + + " does not have privilege to see this attempt " + appAttemptId); } return response; } @@ -418,7 +418,7 @@ public GetApplicationAttemptsResponse getApplicationAttempts( response = GetApplicationAttemptsResponse.newInstance(listAttempts); } else { throw new YarnException("User " + callerUGI.getShortUserName() - + " does not have privilage to see this aplication " + appId); + + " does not have privilege to see this application " + appId); } return response; } @@ -469,7 +469,7 @@ public GetContainerReportResponse getContainerReport( .createContainerReport()); } else { throw new YarnException("User " + callerUGI.getShortUserName() - + " does not have privilage to see this aplication " + appId); + + " does not have privilege to see this application " + appId); } return response; } @@ -522,7 +522,7 @@ public GetContainersResponse getContainers(GetContainersRequest request) response = GetContainersResponse.newInstance(listContainers); } else { throw new YarnException("User " + callerUGI.getShortUserName() - + " does not have privilage to see this aplication " + appId); + + " does not have privilege to see this application " + appId); } return response; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClusterMetrics.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClusterMetrics.java index 1114dc0880d5d7c051b6c7f45e7c1b07507acd5d..cf20657cab7d7ceeb5bd728826ab84f778d864b3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClusterMetrics.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClusterMetrics.java @@ -87,7 +87,7 @@ public int getNumActiveNMs() { return numActiveNMs.value(); } - //Decommisioned NMs + //Decommissioned NMs public int getNumDecommisionedNMs() { return numDecommissionedNMs.value(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java index 2d9431d5297f15477b3c03484ce39876f7373882..055acbfd23093d9ada2dee8a52062ea7f74de026 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMAppManager.java @@ -261,7 +261,7 @@ protected synchronized void checkAppNumCompletedLimit() { completedAppsInStateStore--; } - // check apps kept in memorty. + // check apps kept in memory. while (completedApps.size() > this.maxCompletedAppsInMemory) { ApplicationId removeId = completedApps.remove(); LOG.info("Application should be expired, max number of completed apps" diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java index 4d2e41c5978b1fa6e493e302f915baa94a8ed113..6cf2badbb72b7b722df6742f4c93414f9085aafc 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMServerUtils.java @@ -255,7 +255,7 @@ public static YarnApplicationAttemptState createApplicationAttemptState( } /** - * Statically defined dummy ApplicationResourceUsageREport. Used as + * Statically defined dummy ApplicationResourceUsageReport. Used as * a return value when a valid report cannot be found. */ public static final ApplicationResourceUsageReport diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java index 609f4031d27731abc43ad62f8112872c1194a386..fd05488c62a4ed12cf8da846c3e93065562ced91 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/MemoryRMStateStore.java @@ -146,7 +146,7 @@ public synchronized void removeApplicationStateInternal( ApplicationStateData removed = state.appState.remove(appId); if (removed == null) { - throw new YarnRuntimeException("Removing non-exsisting application state"); + throw new YarnRuntimeException("Removing nonexistent application state"); } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java index 8f096d882aaf14adf29a5235f481904bbade6376..861b1ae85279b6d837c22f36c7e47168b421a50a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java @@ -663,7 +663,7 @@ protected synchronized void updateRMDelegationTokenState( } else { // in case znode doesn't exist addStoreOrUpdateOps(trx, rmDTIdentifier, renewDate, false); - LOG.debug("Attempted to update a non-existing znode " + nodeRemovePath); + LOG.debug("Attempted to update a nonexistent znode " + nodeRemovePath); } trx.commit(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java index 8a15ac6a07b80b63fb9d0ffade87b3048f4842cc..02e68535e2cfef38c71d9b46abf1e48e614a0edb 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractReservationSystem.java @@ -348,7 +348,7 @@ protected Plan initializePlan(String planQueueName) throws YarnException { minAllocation, maxAllocation, planQueueName, getReplanner(planQueuePath), getReservationSchedulerConfiguration() .getMoveOnExpiry(planQueuePath)); - LOG.info("Intialized plan {0} based on reservable queue {1}", + LOG.info("Initialized plan {0} based on reservable queue {1}", plan.toString(), planQueueName); return plan; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java index ea7f27d2c035d3cba1d57687d55461827a59e364..8a9e40219b33ebca249122b74b7e0e0f8e8f4771 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/AbstractSchedulerPlanFollower.java @@ -96,7 +96,7 @@ public synchronized void synchronizePlan(Plan plan) { int numRes = getReservedResources(now, currentReservations, curReservationNames, reservedResources); - // create the default reservation queue if it doesnt exist + // create the default reservation queue if it doesn't exist String defReservationId = getReservationIdFromQueueName(planQueueName) + ReservationConstants.DEFAULT_QUEUE_SUFFIX; String defReservationQueue = getReservationQueueName(planQueueName, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java index 3f6f4054354089e47f1a8964d61918710da79d80..6063f9a6ed7344ddab4d469a72f59e62b77a6ea7 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java @@ -205,12 +205,12 @@ public boolean removeInterval(ReservationInterval reservationInterval, cumulativeCapacity.put(currentKey, updatedCapacity); } // Remove the first overlap entry if it is same as previous after - // updation + // updating Long firstKey = overlapSet.firstKey(); if (isSameAsPrevious(firstKey, overlapSet.get(firstKey))) { cumulativeCapacity.remove(firstKey); } - // Remove the next entry if it is same as end entry after updation + // Remove the next entry if it is same as end entry after updating if ((currentKey != -1) && (isSameAsNext(currentKey, updatedCapacity))) { cumulativeCapacity.remove(cumulativeCapacity.higherKey(currentKey)); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMApp.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMApp.java index be9dfaf91ad17a12329748e85a4c3fe5792291d1..2288626263cfbfca72301ccee0b0e6cf7837a697 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMApp.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMApp.java @@ -215,7 +215,7 @@ ApplicationReport createAndGetApplicationReport(String clientUserName, /** * Check whether this application's state has been saved to the state store. - * @return the flag indicating whether the applications's state is stored. + * @return the flag indicating whether the application's state is stored. */ boolean isAppFinalStateStored(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttempt.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttempt.java index b85174efcf6d2802f38e4ecf6a36d3025d92f239..c19e00995cb17d378856d69911a1f00bcfea60fb 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttempt.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttempt.java @@ -138,7 +138,7 @@ List getJustFinishedContainers(); /** - * The map of conatiners per Node that are already sent to the AM. + * The map of containers per Node that are already sent to the AM. * @return map of per node list of finished container status sent to AM */ ConcurrentMap> diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java index 5171bba3dca6b6902532fdd62d338c1ded3f65b5..8e4b5042e6c1eef00a1dc6b40348f5e2c72e7ecb 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java @@ -1125,9 +1125,9 @@ private void rememberTargetTransitionsAndStoreState(RMAppAttemptEvent event, int exitStatus = ContainerExitStatus.INVALID; switch (event.getType()) { case LAUNCH_FAILED: - RMAppAttemptLaunchFailedEvent launchFaileEvent = + RMAppAttemptLaunchFailedEvent launchFailedEvent = (RMAppAttemptLaunchFailedEvent) event; - diags = launchFaileEvent.getMessage(); + diags = launchFailedEvent.getMessage(); break; case REGISTERED: diags = getUnexpectedAMRegisteredDiagnostics(); @@ -1354,9 +1354,9 @@ public void transition(RMAppAttemptImpl appAttempt, RMAppAttemptEvent event) { // Use diagnostic from launcher - RMAppAttemptLaunchFailedEvent launchFaileEvent + RMAppAttemptLaunchFailedEvent launchFailedEvent = (RMAppAttemptLaunchFailedEvent) event; - appAttempt.diagnostics.append(launchFaileEvent.getMessage()); + appAttempt.diagnostics.append(launchFailedEvent.getMessage()); // Tell the app, scheduler super.transition(appAttempt, event); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java index f03663a832b75306bbf02f4587d793e262947c27..c5a0e8c8d38779e2a1a9cb15c3af798bf093100d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerNode.java @@ -119,7 +119,7 @@ public String getHttpAddress() { * Typically this is the 'hostname' reported by the node, but it could be * configured to be 'hostname:port' reported by the node via the * {@link YarnConfiguration#RM_SCHEDULER_INCLUDE_PORT_IN_NODE_NAME} constant. - * The main usecase of this is Yarn minicluster to be able to differentiate + * The main use case of this is Yarn minicluster to be able to differentiate * node manager instances by their port number. * * @return name of the node for scheduling matching decisions. @@ -209,7 +209,7 @@ public synchronized void releaseContainer(Container container) { return; } - /* remove the containers from the nodemanger */ + /* remove the containers from the nodemanager */ if (null != launchedContainers.remove(container.getId())) { updateResource(container); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java index 8047d0bde3d75cff5d2fa3114cac9d53c8984d4d..d9b495eaa3d17ec786af94ea32ccbb08bfe263d1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerUtils.java @@ -283,7 +283,7 @@ private static void validateResourceRequest(ResourceRequest resReq, if (!ResourceRequest.ANY.equals(resReq.getResourceName()) && labelExp != null && !labelExp.trim().isEmpty()) { throw new InvalidResourceRequestException( - "Invailid resource request, queue=" + queueInfo.getQueueName() + "Invalid resource request, queue=" + queueInfo.getQueueName() + " specified node label expression in a " + "resource request has resource name = " + resReq.getResourceName()); @@ -292,7 +292,7 @@ private static void validateResourceRequest(ResourceRequest resReq, // we don't allow specify label expression with more than one node labels now if (labelExp != null && labelExp.contains("&&")) { throw new InvalidResourceRequestException( - "Invailid resource request, queue=" + queueInfo.getQueueName() + "Invalid resource request, queue=" + queueInfo.getQueueName() + " specified more than one node label " + "in a node label expression, node label expression = " + labelExp); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java index b99b2170d0a1bbeca50884f0448359229b987e03..bc7e88ed26857be2a063118c956b0c8c142d7a2c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java @@ -123,8 +123,8 @@ public QueueInfo getQueueInfo(String queueName, boolean includeChildQueues, /** * The main api between the ApplicationMaster and the Scheduler. * The ApplicationMaster is updating his future resource requirements - * and may release containers he doens't need. - * + * and may release containers he doesn't need. + * * @param appAttemptId * @param ask * @param release diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java index 141aa7fb092db59e095f91c0e312afe13ab3bebc..5462e7dbc76a2ceb46574c8a7df8ef6758c30724 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java @@ -891,7 +891,7 @@ public Allocation allocate(ApplicationAttemptId applicationAttemptId, FiCaSchedulerApp application = getApplicationAttempt(applicationAttemptId); if (application == null) { LOG.info("Calling allocate on removed " + - "or non existant application " + applicationAttemptId); + "or nonexistent application " + applicationAttemptId); return EMPTY_ALLOCATION; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java index e5b44a6a0d2515963e2002eae710d0f9264d8732..a78e54d90efa5b02c6aff040f66ef3a35981d7b3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java @@ -223,7 +223,7 @@ protected synchronized void setupQueueConfigs(Resource clusterResource) LOG.info("Initializing " + queueName + "\n" + "capacity = " + queueCapacities.getCapacity() + " [= (float) configuredCapacity / 100 ]" + "\n" + - "asboluteCapacity = " + queueCapacities.getAbsoluteCapacity() + + "absoluteCapacity = " + queueCapacities.getAbsoluteCapacity() + " [= parentAbsoluteCapacity * capacity ]" + "\n" + "maxCapacity = " + queueCapacities.getMaximumCapacity() + " [= configuredMaxCapacity ]" + "\n" + @@ -1090,7 +1090,7 @@ private Resource computeUserLimit(FiCaSchedulerApp application, // What is our current capacity? // * It is equal to the max(required, queue-capacity) if // we're running below capacity. The 'max' ensures that jobs in queues - // with miniscule capacity (< 1 slot) make progress + // with minuscule capacity (< 1 slot) make progress // * If we're running over capacity, then its // (usedResources + required) (which extra resources we are allocating) Resource queueCapacity = @@ -1099,7 +1099,7 @@ private Resource computeUserLimit(FiCaSchedulerApp application, queueCapacities.getAbsoluteCapacity(nodePartition), minimumAllocation); - // Allow progress for queues with miniscule capacity + // Allow progress for queues with minuscule capacity queueCapacity = Resources.max( resourceCalculator, clusterResource, @@ -1966,7 +1966,7 @@ public void recoverContainer(Resource clusterResource, return orderingPolicy.getSchedulableEntities(); } - // return a single Resource capturing the overal amount of pending resources + // return a single Resource capturing the overall amount of pending resources public synchronized Resource getTotalResourcePending() { Resource ret = BuilderUtils.newResource(0, 0); for (FiCaSchedulerApp f : diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java index 7419446aa5a7b0ff55c13168df0217592a7da0c4..4ee73206bf5e003823024252bc4d56d74b701b70 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSAppAttempt.java @@ -421,7 +421,7 @@ public void clearPreemptedResources() { /** * Create and return a container object reflecting an allocation for the - * given appliction on the given node with the given capability and + * given application on the given node with the given capability and * priority. */ public Container createContainer( @@ -442,8 +442,8 @@ public Container createContainer( /** * Reserve a spot for {@code container} on this {@code node}. If * the container is {@code alreadyReserved} on the node, simply - * update relevant bookeeping. This dispatches ro relevant handlers - * in {@link FSSchedulerNode}.. + * update relevant bookkeeping. This dispatches to relevant handlers + * in {@link FSSchedulerNode}. */ private void reserve(Priority priority, FSSchedulerNode node, Container container, boolean alreadyReserved) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java index cbc10e7c1b806627d40ab5d61c9ada7c60dc198e..52079ba56eb95f956d8746865c873a458368e4b5 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java @@ -466,7 +466,7 @@ protected void warnOrKillContainer(RMContainer container) { // containers on the RMNode (see SchedulerNode.releaseContainer()). completedContainer(container, status, RMContainerEventType.KILL); LOG.info("Killing container" + container + - " (after waiting for premption for " + + " (after waiting for preemption for " + (getClock().getTime() - time) + "ms)"); } } else { @@ -908,7 +908,7 @@ public Allocation allocate(ApplicationAttemptId appAttemptId, FSAppAttempt application = getSchedulerApp(appAttemptId); if (application == null) { LOG.info("Calling allocate on removed " + - "or non existant application " + appAttemptId); + "or non existent application " + appAttemptId); return EMPTY_ALLOCATION; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.java index f75043814d0c2654744b1e1e0e5b0908e74eac37..ab928800dae702b804d8157a8654c5e67fc3fc6d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/MaxRunningAppsEnforcer.java @@ -106,7 +106,7 @@ public void trackNonRunnableApp(FSAppAttempt app) { /** * This is called after reloading the allocation configuration when the - * scheduler is reinitilized + * scheduler is reinitialized * * Checks to see whether any non-runnable applications become runnable * now that the max running apps of given queue has been changed diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java index 6556717ba4300ac943f90f18423c3d5cc350abc9..491230285c9724ba95c638f5c51a833be7193795 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/QueueManager.java @@ -76,7 +76,7 @@ public void initialize(Configuration conf) throws IOException, /** * Get a leaf queue by name, creating it if the create param is true and is necessary. - * If the queue is not or can not be a leaf queue, i.e. it already exists as a + * If the queue is not or cannot be a leaf queue, i.e. it already exists as a * parent queue, or one of the parents in its name is already a leaf queue, * null is returned. * @@ -105,14 +105,14 @@ public boolean removeLeafQueue(String name) { /** - * Get a parent queue by name, creating it if the create param is true and is necessary. - * If the queue is not or can not be a parent queue, i.e. it already exists as a - * leaf queue, or one of the parents in its name is already a leaf queue, - * null is returned. - * - * The root part of the name is optional, so a queue underneath the root + * Get a parent queue by name, creating it if the create param is true and + * is necessary. If the queue is not or cannot be a parent queue, i.e. it + * already exists as a leaf queue, or one of the parents in its name is + * already a leaf queue, null is returned. + * + * The root part of the name is optional, so a queue underneath the root * named "queue1" could be referred to as just "queue1", and a queue named - * "queue2" underneath a parent named "parent1" that is underneath the root + * "queue2" underneath a parent named "parent1" that is underneath the root * could be referred to as just "parent1.queue2". */ public FSParentQueue getParentQueue(String name, boolean create) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java index b8c419cdec0d9e3458a10f1e3feba2dee8fb5cfc..36c10f4cbc667ca8f91b053dd3d0204e82c5a1fc 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/FifoScheduler.java @@ -309,7 +309,7 @@ public Allocation allocate( FiCaSchedulerApp application = getApplicationAttempt(applicationAttemptId); if (application == null) { LOG.error("Calling allocate on removed " + - "or non existant application " + applicationAttemptId); + "or nonexistent application " + applicationAttemptId); return EMPTY_ALLOCATION; } @@ -622,7 +622,7 @@ private int assignRackLocalContainers(FiCaSchedulerNode node, ResourceRequest request = application.getResourceRequest(priority, node.getRMNode().getRackName()); if (request != null) { - // Don't allocate on this rack if the application doens't need containers + // Don't allocate on this rack if the application doesn't need containers ResourceRequest offSwitchRequest = application.getResourceRequest(priority, ResourceRequest.ANY); if (offSwitchRequest.getNumContainers() <= 0) { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/AbstractComparatorOrderingPolicy.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/AbstractComparatorOrderingPolicy.java index c4d2aae318b0a4b504641702d2f336bcd560af62..1a753a9618805dbffb47fe417568e1d3bf5f5dab 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/AbstractComparatorOrderingPolicy.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/AbstractComparatorOrderingPolicy.java @@ -28,7 +28,7 @@ /** - * An OrderingPolicy which can serve as a baseclass for policies which can be + * An OrderingPolicy which can serve as a base class for policies which can be * expressed in terms of comparators */ public abstract class AbstractComparatorOrderingPolicy implements OrderingPolicy { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptsInfo.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptsInfo.java index 07b93f2389ec7e53a27eecb231a2561e0ea9f2cf..8959e4dbf5fcedc65c59c3b00a653cb033185db9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptsInfo.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/AppAttemptsInfo.java @@ -9,7 +9,7 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by joblicable law or agreed to in writing, software + * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java index 9b7eb840dbecce9c2d3435922ac42dfdfc1bc9a8..64f8cdecc427fa0ce14248a30a439442a35f90d6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/Application.java @@ -322,7 +322,7 @@ private synchronized void addResourceRequest( if(LOG.isDebugEnabled()) { LOG.debug("getResources() for " + applicationId + ":" - + " ask=" + ask.size() + " recieved=" + containers.size()); + + " ask=" + ask.size() + " received=" + containers.size()); } return containers; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java index 3db8b7c339416b6bacafea31c85b3eb3b12adec1..eeb4ea88c4ce258ecf86a300a53d983b0aea914d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java @@ -592,7 +592,7 @@ public void testRMAppSubmitDuplicateApplicationId() throws Exception { appMonitor.submitApplication(asContext, "test"); Assert.fail("Exception is expected when applicationId is duplicate."); } catch (YarnException e) { - Assert.assertTrue("The thrown exception is not the expectd one.", + Assert.assertTrue("The thrown exception is not the expected one.", e.getMessage().contains("Cannot add a duplicate!")); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java index 6e08aeb37456b14f752f2c047d6b433cad8b454b..75ed9d2a978a09401000384b9fde95cdb2168513 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationCleanup.java @@ -490,7 +490,7 @@ public void testAppCleanupWhenNMReconnects() throws Exception { // memory. 1024 + 2048=3072 // 5. Re-register NM by sending completed container status // 6. Verify for Memory Used, it should be 1024 - // 7. Send AM heatbeat to RM. Allocated response should contain completed + // 7. Send AM heartbeat to RM. Allocated response should contain completed // container. @Test(timeout = 60000) public void testProcessingNMContainerStatusesOnNMRestart() throws Exception { @@ -543,7 +543,7 @@ public void testProcessingNMContainerStatusesOnNMRestart() throws Exception { // 6. Verify for Memory Used, it should be 1024 Assert.assertEquals(amMemory, rs.getRootQueueMetrics().getAllocatedMB()); - // 7. Send AM heatbeat to RM. Allocated response should contain completed + // 7. Send AM heartbeat to RM. Allocated response should contain completed // container AllocateRequest req = AllocateRequest.newInstance(0, 0F, new ArrayList(), diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java index 85d25151f27f1a86446ee479461514ba6726a0c3..fe58bca437050d2c2a848bb038de55826b936b1e 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java @@ -99,7 +99,7 @@ public void testRMIdentifierOnContainerAllocation() throws Exception { alloc1Response = am1.schedule(); } - // assert RMIdentifer is set properly in allocated containers + // assert RMIdentifier is set properly in allocated containers Container allocatedContainer = alloc1Response.getAllocatedContainers().get(0); ContainerTokenIdentifier tokenId = diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java index fcb48a05ec04d903f45f3f3adc5741a363c9483a..3678543fd06637b89c5c80cc145b85e54649d777 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestContainerResourceUsage.java @@ -82,7 +82,7 @@ public void testUsageWithOneAttemptAndOneContainer() throws Exception { RMAppMetrics rmAppMetrics = app0.getRMAppMetrics(); Assert.assertTrue( - "Before app submittion, memory seconds should have been 0 but was " + "Before app submission, memory seconds should have been 0 but was " + rmAppMetrics.getMemorySeconds(), rmAppMetrics.getMemorySeconds() == 0); Assert.assertTrue( @@ -123,7 +123,7 @@ public void testUsageWithOneAttemptAndOneContainer() throws Exception { AggregateAppResourceUsage ru = calculateContainerResourceMetrics(rmContainer); rmAppMetrics = app0.getRMAppMetrics(); - Assert.assertEquals("Unexcpected MemorySeconds value", + Assert.assertEquals("Unexpected MemorySeconds value", ru.getMemorySeconds(), rmAppMetrics.getMemorySeconds()); Assert.assertEquals("Unexpected VcoreSeconds value", ru.getVcoreSeconds(), rmAppMetrics.getVcoreSeconds()); @@ -223,7 +223,7 @@ public void testUsageWithMultipleContainersAndRMRestart() throws Exception { } RMAppMetrics metricsBefore = app0.getRMAppMetrics(); - Assert.assertEquals("Unexcpected MemorySeconds value", + Assert.assertEquals("Unexpected MemorySeconds value", memorySeconds, metricsBefore.getMemorySeconds()); Assert.assertEquals("Unexpected VcoreSeconds value", vcoreSeconds, metricsBefore.getVcoreSeconds()); @@ -390,7 +390,7 @@ private void amRestartTests(boolean keepRunningContainers) RMAppMetrics rmAppMetrics = app.getRMAppMetrics(); - Assert.assertEquals("Unexcpected MemorySeconds value", + Assert.assertEquals("Unexpected MemorySeconds value", memorySeconds, rmAppMetrics.getMemorySeconds()); Assert.assertEquals("Unexpected VcoreSeconds value", vcoreSeconds, rmAppMetrics.getVcoreSeconds()); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java index 149ddf57371f9251881767bb08bb31fd703da3fb..798b15da27fa348423e5dda15e1fd6d4ab6eabd7 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java @@ -71,7 +71,7 @@ public void testKillAppWhenFailoverHappensAtNewState() // failover and kill application // When FailOver happens, the state of this application is NEW, // and ApplicationState is not saved in RMStateStore. The active RM - // can not load the ApplicationState of this application. + // cannot load the ApplicationState of this application. // Expected to get ApplicationNotFoundException // when receives the KillApplicationRequest try { diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java index 0200e858ac2d8c4d07d4c9dc1c76c63aad0ae806..10d4e126e7e35d344b21482f3f40690b84a154af 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java @@ -380,7 +380,7 @@ public void testHAIDLookup() { rm.init(conf); assertEquals(conf.get(YarnConfiguration.RM_HA_ID), RM1_NODE_ID); - //test if RM_HA_ID can not be found + //test if RM_HA_ID cannot be found configuration.set(YarnConfiguration.RM_HA_IDS, RM1_NODE_ID+ "," + RM3_NODE_ID); configuration.unset(YarnConfiguration.RM_HA_ID); conf = new YarnConfiguration(configuration); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java index de17acdb4c7bd102dd9be363482a928d806b3e19..f897d4863e4084d89d4dad0cd6230e7f71572910 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java @@ -1159,7 +1159,7 @@ public void testDelegationTokenRestoredInDelegationTokenRenewer() ApplicationStateData appState = rmAppState.get(app.getApplicationId()); Assert.assertNotNull(appState); - // assert delegation tokens exist in rm1 DelegationTokenRenewr + // assert delegation tokens exist in rm1 DelegationTokenRenewer Assert.assertEquals(tokenSet, rm1.getRMContext() .getDelegationTokenRenewer().getDelegationTokens()); @@ -1479,7 +1479,7 @@ public void serviceStop() throws Exception { @Override protected void handleStoreEvent(RMStateStoreEvent event) { // Block app saving request. - // Skip if synchronous updation of DTToken + // Skip if synchronous updating of DTToken if (!(event instanceof RMStateStoreAMRMTokenEvent) && !(event instanceof RMStateStoreRMDTEvent) && !(event instanceof RMStateStoreRMDTMasterKeyEvent)) { @@ -1672,7 +1672,7 @@ protected Credentials parseCredentials( new HashMap(), false, "default", -1, null, "MAPREDUCE", false); rm1.waitForState(app1.getApplicationId(), RMAppState.FAILED); - // Check app staet is saved in state store. + // Check app state is saved in state store. Assert.assertEquals(RMAppState.FAILED, memStore.getState() .getApplicationState().get(app1.getApplicationId()).getState()); @@ -1889,7 +1889,7 @@ protected Dispatcher createDispatcher() { .assertTrue( NodeAction.SHUTDOWN.equals(nodeHeartbeat.getNodeAction())); nodeHeartbeat = nm2.nodeHeartbeat(true); - Assert.assertTrue("The decommisioned metrics are not updated", + Assert.assertTrue("The decommissioned metrics are not updated", NodeAction.SHUTDOWN.equals(nodeHeartbeat.getNodeAction())); dispatcher.await(); @@ -1920,7 +1920,7 @@ protected Dispatcher createDispatcher() { // Test Delegation token is renewed synchronously so that recover events // can be processed before any other external incoming events, specifically - // the ContainerFinished event on NM re-registraton. + // the ContainerFinished event on NM re-registration. @Test (timeout = 20000) public void testSynchronouslyRenewDTOnRecovery() throws Exception { conf.setInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS, 2); @@ -2077,9 +2077,9 @@ protected void doSecureLogin() throws IOException { // Test does following verification // 1. Start RM1 with store patch /tmp - // 2. Add/remove/replace labels to cluster and node lable and verify + // 2. Add/remove/replace labels to cluster and node label and verify // 3. Start RM2 with store patch /tmp only - // 4. Get cluster and node lobel, it should be present by recovering it + // 4. Get cluster and node label, it should be present by recovering it @Test(timeout = 20000) public void testRMRestartRecoveringNodeLabelManager() throws Exception { // Initial FS node label store root dir to a random tmp dir @@ -2127,7 +2127,7 @@ protected RMNodeLabelsManager createNodeLabelManager() { // Remove cluster label z nodeLabelManager.removeFromClusterNodeLabels(toSet("z")); - // Replace nodelabel h1->x,y + // Replace node label h1->x,y nodeLabelManager.replaceLabelsOnNode(ImmutableMap.of(n1, toSet("y"))); // Wait for updating store.It is expected NodeStore update should happen diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java index 94a0e4cc8c8d797fb1aa8c3763adea065bdae732..2259aa53d15e7f2e6902bc7a3353c4b5d06ff0b3 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java @@ -148,7 +148,7 @@ public void testDecommissionWithIncludeHosts() throws Exception { .assertEquals(1, ClusterMetrics.getMetrics().getNumDecommisionedNMs()); nodeHeartbeat = nm2.nodeHeartbeat(true); - Assert.assertTrue("Node is not decommisioned.", NodeAction.SHUTDOWN + Assert.assertTrue("Node is not decommissioned.", NodeAction.SHUTDOWN .equals(nodeHeartbeat.getNodeAction())); nodeHeartbeat = nm3.nodeHeartbeat(true); @@ -200,11 +200,11 @@ protected Dispatcher createDispatcher() { nodeHeartbeat = nm1.nodeHeartbeat(true); Assert.assertTrue(NodeAction.NORMAL.equals(nodeHeartbeat.getNodeAction())); nodeHeartbeat = nm2.nodeHeartbeat(true); - Assert.assertTrue("The decommisioned metrics are not updated", + Assert.assertTrue("The decommissioned metrics are not updated", NodeAction.SHUTDOWN.equals(nodeHeartbeat.getNodeAction())); nodeHeartbeat = nm3.nodeHeartbeat(true); - Assert.assertTrue("The decommisioned metrics are not updated", + Assert.assertTrue("The decommissioned metrics are not updated", NodeAction.SHUTDOWN.equals(nodeHeartbeat.getNodeAction())); dispatcher.await(); @@ -216,7 +216,7 @@ protected Dispatcher createDispatcher() { nodeHeartbeat = nm3.nodeHeartbeat(true); dispatcher.await(); Assert.assertTrue(NodeAction.NORMAL.equals(nodeHeartbeat.getNodeAction())); - // decommissined node is 1 since 1 node is rejoined after updating exclude + // decommissioned node is 1 since 1 node is rejoined after updating exclude // file checkDecommissionedNMCount(rm, metricCount + 1); } @@ -249,11 +249,11 @@ public void testAddNewIncludePathToConfiguration() throws Exception { checkDecommissionedNMCount(rm, ++initialMetricCount); nodeHeartbeat = nm1.nodeHeartbeat(true); Assert.assertEquals( - "Node should not have been decomissioned.", + "Node should not have been decommissioned.", NodeAction.NORMAL, nodeHeartbeat.getNodeAction()); nodeHeartbeat = nm2.nodeHeartbeat(true); - Assert.assertEquals("Node should have been decomissioned but is in state" + + Assert.assertEquals("Node should have been decommissioned but is in state" + nodeHeartbeat.getNodeAction(), NodeAction.SHUTDOWN, nodeHeartbeat.getNodeAction()); } @@ -286,11 +286,11 @@ public void testAddNewExcludePathToConfiguration() throws Exception { checkDecommissionedNMCount(rm, ++initialMetricCount); nodeHeartbeat = nm1.nodeHeartbeat(true); Assert.assertEquals( - "Node should not have been decomissioned.", + "Node should not have been decommissioned.", NodeAction.NORMAL, nodeHeartbeat.getNodeAction()); nodeHeartbeat = nm2.nodeHeartbeat(true); - Assert.assertEquals("Node should have been decomissioned but is in state" + + Assert.assertEquals("Node should have been decommissioned but is in state" + nodeHeartbeat.getNodeAction(), NodeAction.SHUTDOWN, nodeHeartbeat.getNodeAction()); } @@ -341,7 +341,7 @@ protected RMNodeLabelsManager createNodeLabelManager() { try { nodeLabelsMgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet("A", "B", "C")); } catch (IOException e) { - Assert.fail("Caught Exception while intializing"); + Assert.fail("Caught Exception while initializing"); e.printStackTrace(); } @@ -390,7 +390,7 @@ protected RMNodeLabelsManager createNodeLabelManager() { try { nodeLabelsMgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet("X", "Y", "Z")); } catch (IOException e) { - Assert.fail("Caught Exception while intializing"); + Assert.fail("Caught Exception while initializing"); e.printStackTrace(); } @@ -443,7 +443,7 @@ protected RMNodeLabelsManager createNodeLabelManager() { try { nodeLabelsMgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet("X", "Y", "Z")); } catch (IOException e) { - Assert.fail("Caught Exception while intializing"); + Assert.fail("Caught Exception while initializing"); e.printStackTrace(); } @@ -495,7 +495,7 @@ protected RMNodeLabelsManager createNodeLabelManager() { try { nodeLabelsMgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet("A", "B", "C")); } catch (IOException e) { - Assert.fail("Caught Exception while intializing"); + Assert.fail("Caught Exception while initializing"); e.printStackTrace(); } ResourceTrackerService resourceTrackerService = @@ -555,7 +555,7 @@ protected RMNodeLabelsManager createNodeLabelManager() { try { nodeLabelsMgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet("A", "B", "C")); } catch (IOException e) { - Assert.fail("Caught Exception while intializing"); + Assert.fail("Caught Exception while initializing"); e.printStackTrace(); } @@ -640,7 +640,7 @@ protected RMNodeLabelsManager createNodeLabelManager() { try { nodeLabelsMgr.addToCluserNodeLabelsWithDefaultExclusivity(toSet("A", "B", "C")); } catch (IOException e) { - Assert.fail("Caught Exception while intializing"); + Assert.fail("Caught Exception while initializing"); e.printStackTrace(); } @@ -1214,7 +1214,7 @@ private void checkDecommissionedNMCount(MockRM rm, int count) } Assert.assertEquals(count, ClusterMetrics.getMetrics() .getNumDecommisionedNMs()); - Assert.assertEquals("The decommisioned metrics are not updated", count, + Assert.assertEquals("The decommissioned metrics are not updated", count, ClusterMetrics.getMetrics().getNumDecommisionedNMs()); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.java index 4cceddd294093aa616ab2464938e7d75bd730402..ff3f5099c1373b1199914e52754f48a125e19b2c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.java @@ -81,7 +81,7 @@ private void verifySubmitApp(MockRM rm, RMApp app, Thread.sleep(200); count++; } - // Verify submittion is successful + // Verify submission is successful YarnApplicationState state = rm.getApplicationReport(app.getApplicationId()) .getYarnApplicationState(); @@ -148,7 +148,7 @@ private void verifySubmitApp(MockRM rm, RMApp app, explicitFailover(); // Since the applicationState is not saved in RMStateStore - // when failover happens. The current active RM can not load + // when failover happens. The current active RM cannot load // previous applicationState. // Expect ApplicationNotFoundException by calling getApplicationReport(). try { @@ -229,7 +229,7 @@ public void testGetApplicationReportIdempotent() throws Exception{ testHandleRMHADuringSubmitApplicationCallWithSavedApplicationState() throws Exception { // Test scenario 1 when RM failover happens - // druing SubmitApplication Call: + // during SubmitApplication Call: // RMStateStore already saved the ApplicationState when failover happens startRMs(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java index 32743c97bade9e1c7a0c7c627d0ee73263b01e49..ec034062a1328a40b303a8756a9e6b41df8f6647 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestWorkPreservingRMRestart.java @@ -522,7 +522,7 @@ public void testCapacitySchedulerRecovery() throws Exception { //Test that we receive a meaningful exit-causing exception if a queue //is removed during recovery - //1. Add some apps to two queues, attempt to add an app to a non-existant + //1. Add some apps to two queues, attempt to add an app to a nonexistent // queue to verify that the new logic is not in effect during normal app // submission //2. Remove one of the queues, restart the RM @@ -556,7 +556,7 @@ public void testCapacitySchedulerQueueRemovedRecovery() throws Exception { RMApp app2 = rm1.submitApp(1024, "app2", USER_2, null, B); MockAM am2 = MockRM.launchAndRegisterAM(app2, rm1, nm2); - //Submit an app with a non existant queue to make sure it does not + //Submit an app with a nonexistent queue to make sure it does not //cause a fatal failure in the non-recovery case RMApp appNA = rm1.submitApp(1024, "app1_2", USER_1, null, QUEUE_DOESNT_EXIST, false); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java index 9e0d22bb2441780e54035b32de163e116b2059b1..c94f41b72a61219aaf9c0f947be44d82e04bb814 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java @@ -640,7 +640,7 @@ public void testAMRMTokenSecretManagerStateStore( AMRMTokenSecretManager appTokenMgr = new AMRMTokenSecretManager(conf, rmContext); - //create and save the first masterkey + //create and save the first master key MasterKeyData firstMasterKeyData = appTokenMgr.createNewMasterKey(); AMRMTokenSecretManagerState state1 = @@ -661,7 +661,7 @@ public void testAMRMTokenSecretManagerStateStore( Assert.assertNull(state .getAMRMTokenSecretManagerState().getNextMasterKey()); - //create and save the second masterkey + //create and save the second master key MasterKeyData secondMasterKeyData = appTokenMgr.createNewMasterKey(); AMRMTokenSecretManagerState state2 = AMRMTokenSecretManagerState @@ -681,7 +681,7 @@ public void testAMRMTokenSecretManagerStateStore( Assert.assertEquals(secondMasterKeyData.getMasterKey(), state_2 .getAMRMTokenSecretManagerState().getNextMasterKey()); - // re-create the masterKeyData based on the recovered masterkey + // re-create the masterKeyData based on the recovered master key // should have the same secretKey appTokenMgr.recover(state_2); Assert.assertEquals(appTokenMgr.getCurrnetMasterKeyData().getSecretKey(), diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java index c074ad9e19d846367bfc6aeda65edf0ab5087e23..22730904cf7d2bafe281ad0ed34c7df8405281c2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java @@ -1367,7 +1367,7 @@ public void testGetClientToken() throws Exception { assumeTrue(isSecurityEnabled); Container amContainer = allocateApplicationAttempt(); - // before attempt is launched, can not get ClientToken + // before attempt is launched, cannot get ClientToken Token token = applicationAttempt.createClientToken(null); Assert.assertNull(token); @@ -1386,7 +1386,7 @@ public void testGetClientToken() throws Exception { assertEquals(YarnApplicationAttemptState.LAUNCHED, applicationAttempt.createApplicationAttemptState()); sendAttemptUpdateSavedEvent(applicationAttempt); - // after attempt is killed, can not get Client Token + // after attempt is killed, cannot get Client Token token = applicationAttempt.createClientToken(null); Assert.assertNull(token); token = applicationAttempt.createClientToken("clientuser"); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java index 005f40bcadd007662122aa5ea62a59fdf106c480..e23b08987f457b16e321f1933e42ee4d5714cba6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestQueueMappings.java @@ -185,7 +185,7 @@ public void testQueueMapping() throws Exception { catch (IOException ioex) { fail = true; } - Assert.assertTrue("queue initialization failed for non-existent q", fail); + Assert.assertTrue("queue initialization failed for nonexistent q", fail); resourceManager.stop(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index ec20bba55d138e0b1b733d32412dc33753bf51fd..87bd14ba22c1c9936686ebfa8d757f223e2647a4 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -417,7 +417,7 @@ public void testNonexistNode() throws JSONException, Exception { .path("node_invalid:99").accept(MediaType.APPLICATION_JSON) .get(JSONObject.class); - fail("should have thrown exception on non-existent nodeid"); + fail("should have thrown exception on nonexistent nodeid"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); @@ -445,7 +445,7 @@ public void testNonexistNodeDefault() throws JSONException, Exception { r.path("ws").path("v1").path("cluster").path("nodes") .path("node_invalid:99").get(JSONObject.class); - fail("should have thrown exception on non-existent nodeid"); + fail("should have thrown exception on nonexistent nodeid"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); @@ -473,7 +473,7 @@ public void testNonexistNodeXML() throws JSONException, Exception { .path("node_invalid:99").accept(MediaType.APPLICATION_XML) .get(JSONObject.class); - fail("should have thrown exception on non-existent nodeid"); + fail("should have thrown exception on nonexistent nodeid"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); assertEquals(Status.NOT_FOUND, response.getClientResponseStatus()); @@ -517,7 +517,7 @@ public void testInvalidNode() throws JSONException, Exception { .path("node_invalid_foo").accept(MediaType.APPLICATION_JSON) .get(JSONObject.class); - fail("should have thrown exception on non-existent nodeid"); + fail("should have thrown exception on nonexistent nodeid"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/ProxyUriUtils.java 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 e130225c8929719b7f9c70ab5cdbc4dcbf9a4ea1..72077dcb3b11b8305782afef1c328f812423ecc0 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/ProxyUriUtils.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/ProxyUriUtils.java @@ -47,7 +47,7 @@ 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 @@ -137,7 +137,7 @@ public static URI getProxyUri(URI originalUri, URI proxyUri, /** * Create a URI form a no scheme Url, such as is returned by the AM. - * @param noSchemeUrl the URL formate returned by an AM + * @param noSchemeUrl the URL format returned by an AM * @return a URI with an http scheme * @throws URISyntaxException if the url is not formatted correctly. */ diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java 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 5935327759cf655a2527b5c1a5ffb59f44be895f..71679ccca916b5fcc5b96fcc42c5db94a150ef8c 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java +++ 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); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java index b1c563cbc87dd078f6a7e3ced670403898f7f41b..d154aeefae97c347c38b498ae4677253f7cba1ef 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java @@ -63,7 +63,7 @@ protected void serviceInit(Configuration conf) throws Exception { } /** - * Log in as the Kerberose principal designated for the proxy + * Log in as the Kerberos principal designated for the proxy * @param conf the configuration holding this information in it. * @throws IOException on any error. */