OOZIE-2750 Spelling errors in the log messages and exception messages (gsohn via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/2b655d74 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/2b655d74 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/2b655d74 Branch: refs/heads/oya Commit: 2b655d746f7da689f3d99c18b240f4d7ea6bfad9 Parents: 9c05166 Author: Robert Kanter <rkan...@apache.org> Authored: Fri Mar 10 15:20:59 2017 -0800 Committer: Robert Kanter <rkan...@apache.org> Committed: Fri Mar 10 15:20:59 2017 -0800 ---------------------------------------------------------------------- .../org/apache/oozie/client/event/jms/JMSMessagingUtils.java | 2 +- core/src/main/java/org/apache/oozie/ErrorCode.java | 4 ++-- .../org/apache/oozie/action/email/EmailActionExecutor.java | 4 ++-- .../java/org/apache/oozie/command/SchemaCheckXCommand.java | 4 ++-- .../apache/oozie/command/coord/CoordActionCheckXCommand.java | 2 +- .../apache/oozie/command/coord/CoordActionStartXCommand.java | 2 +- .../main/java/org/apache/oozie/coord/CoordELFunctions.java | 4 ++-- .../org/apache/oozie/executor/jpa/BatchQueryExecutor.java | 2 +- .../java/org/apache/oozie/service/HCatAccessorService.java | 4 ++-- .../java/org/apache/oozie/service/JMSAccessorService.java | 2 +- .../apache/oozie/command/coord/TestCoordCommandUtils.java | 8 ++++---- release-log.txt | 1 + .../org/apache/oozie/server/SSLServerConnectorFactory.java | 2 +- .../java/org/apache/oozie/action/hadoop/LauncherMain.java | 6 +++--- .../main/java/org/apache/oozie/action/hadoop/PigMain.java | 2 +- .../org/apache/oozie/action/hadoop/PigMainWithOldAPI.java | 2 +- .../oozie/action/hadoop/TestMapReduceActionExecutor.java | 2 +- tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java | 4 ++-- 18 files changed, 29 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/client/src/main/java/org/apache/oozie/client/event/jms/JMSMessagingUtils.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/event/jms/JMSMessagingUtils.java b/client/src/main/java/org/apache/oozie/client/event/jms/JMSMessagingUtils.java index df3b237..d1588e9 100644 --- a/client/src/main/java/org/apache/oozie/client/event/jms/JMSMessagingUtils.java +++ b/client/src/main/java/org/apache/oozie/client/event/jms/JMSMessagingUtils.java @@ -50,7 +50,7 @@ public class JMSMessagingUtils { is.close(); } catch (IOException ioe) { - throw new RuntimeException("I/O error occured for " + CLIENT_PROPERTIES, ioe); + throw new RuntimeException("I/O error occurred for " + CLIENT_PROPERTIES, ioe); } } http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/core/src/main/java/org/apache/oozie/ErrorCode.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/ErrorCode.java b/core/src/main/java/org/apache/oozie/ErrorCode.java index ed1ca60..b03ad06 100644 --- a/core/src/main/java/org/apache/oozie/ErrorCode.java +++ b/core/src/main/java/org/apache/oozie/ErrorCode.java @@ -173,7 +173,7 @@ public enum ErrorCode { E0814(XLog.STD, "SignalCommand for action id=[{0}] is already processed, status=[{1}], , pending=[{2}]"), E0815(XLog.STD, "Action pending=[{0}], status=[{1}]. Skipping ActionCheck Execution"), E0816(XLog.STD, "Action pending=[{0}], status=[{1}]. Skipping ActionStart Execution"), - E0817(XLog.STD, "The wf action [{0}] has been udated recently. Ignoring ActionCheck."), + E0817(XLog.STD, "The wf action [{0}] has been updated recently. Ignoring ActionCheck."), E0818(XLog.STD, "Action [{0}] status is running but WF Job [{1}] status is [{2}]. Expected status is RUNNING or SUSPENDED."), E0819(XLog.STD, "Unable to delete the temp dir of job WF Job [{0}]."), E0820(XLog.STD, "Action user retry max [{0}] is over system defined max [{1}], re-assign to use system max."), @@ -182,7 +182,7 @@ public enum ErrorCode { E0900(XLog.OPS, "JobTracker [{0}] not allowed, not in Oozie''s whitelist. Allowed values are: {1}"), E0901(XLog.OPS, "NameNode [{0}] not allowed, not in Oozie''s whitelist. Allowed values are: {1}"), - E0902(XLog.OPS, "Exception occured: [{0}]"), + E0902(XLog.OPS, "Exception occurred: [{0}]"), E0903(XLog.OPS, "Invalid JobConf, it has not been created by HadoopAccessorService"), E0904(XLog.STD, "Scheme [{0}] not supported in uri [{1}]"), E0905(XLog.STD, "Scheme not present in uri [{0}]"), http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java b/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java index 902c463..d55b3af 100644 --- a/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java @@ -131,7 +131,7 @@ public class EmailActionExecutor extends ActionExecutor { // <to> - One ought to exist. String text = element.getChildTextTrim(TO, ns); if (text.isEmpty()) { - throw new ActionExecutorException(ErrorType.ERROR, "EM001", "No receipents were specified in the to-address field."); + throw new ActionExecutorException(ErrorType.ERROR, "EM001", "No recipients were specified in the to-address field."); } tos = text.split(COMMA); @@ -278,7 +278,7 @@ public class EmailActionExecutor extends ActionExecutor { throw new ActionExecutorException(ErrorType.ERROR, "EM004", "Bad address format in <to> or <cc> or <bcc>.", e); } catch (MessagingException e) { - throw new ActionExecutorException(ErrorType.ERROR, "EM005", "An error occured while adding recipients.", e); + throw new ActionExecutorException(ErrorType.ERROR, "EM005", "An error occurred while adding recipients.", e); } catch (URISyntaxException e) { throw new ActionExecutorException(ErrorType.ERROR, "EM008", "Encountered an error when attaching a file", e); http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/core/src/main/java/org/apache/oozie/command/SchemaCheckXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/SchemaCheckXCommand.java b/core/src/main/java/org/apache/oozie/command/SchemaCheckXCommand.java index d1ea294..521408e 100644 --- a/core/src/main/java/org/apache/oozie/command/SchemaCheckXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/SchemaCheckXCommand.java @@ -121,14 +121,14 @@ public class SchemaCheckXCommand extends XCommand<Void> { LOG.info("Database schema is GOOD"); } } catch (SQLException sqle) { - LOG.error("An Exception occured while talking to the database: " + sqle.getMessage(), sqle); + LOG.error("An Exception occurred while talking to the database: " + sqle.getMessage(), sqle); problem = true; } finally { if (conn != null) { try { conn.close(); } catch (Exception e) { - LOG.error("An Exception occured while disconnecting from the database: " + e.getMessage(), e); + LOG.error("An Exception occurred while disconnecting from the database: " + e.getMessage(), e); } } Services.get().get(SchemaCheckerService.class).updateInstrumentation(problem, startTime); http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java index cdad69e..6b849ee 100644 --- a/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/coord/CoordActionCheckXCommand.java @@ -207,7 +207,7 @@ public class CoordActionCheckXCommand extends CoordinatorXCommand<Void> { Timestamp cactionLmt = coordAction.getLastModifiedTimestamp(); if (cactionLmt.after(actionCheckTs)) { throw new PreconditionException(ErrorCode.E1100, "The coord action :" + actionId - + " has been udated. Ignore CoordActionCheckCommand!"); + + " has been updated. Ignore CoordActionCheckCommand!"); } if (coordAction.getStatus().equals(CoordinatorAction.Status.SUCCEEDED) || coordAction.getStatus().equals(CoordinatorAction.Status.FAILED) http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java index 45abe5a..16d7036 100644 --- a/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/coord/CoordActionStartXCommand.java @@ -254,7 +254,7 @@ public class CoordActionStartXCommand extends CoordinatorXCommand<Void> { catch (CommandException ce) { errMsg = ce.getMessage(); errCode = ce.getErrorCode().toString(); - log.warn("command exception occured ", ce); + log.warn("command exception occurred ", ce); } catch (java.io.IOException ioe) { errMsg = ioe.getMessage(); http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java b/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java index 5b4dae4..1af5ec7 100644 --- a/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java +++ b/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java @@ -854,7 +854,7 @@ public class CoordELFunctions { // than initial instance if (currentInstance == null) { throw new CommandException(ErrorCode.E1010, - "intial-instance should be equal or earlier than the start-instance. intial-instance is " + "initial-instance should be equal or earlier than the start-instance. initial-instance is " + getInitialInstance() + " and start-instance is " + startInstance); } if (currentInstance.getTimeInMillis() != startInstanceCal.getTimeInMillis()) { @@ -866,7 +866,7 @@ public class CoordELFunctions { int[] nominalCount = new int[1]; if (getCurrentInstance(getActionCreationtime(), nominalCount) == null) { throw new CommandException(ErrorCode.E1010, - "intial-instance should be equal or earlier than the nominal time. intial-instance is " + "initial-instance should be equal or earlier than the nominal time. initial-instance is " + getInitialInstance() + " and nominal time is " + getActionCreationtime()); } // getCurrentInstance return offset relative to initial instance. http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/core/src/main/java/org/apache/oozie/executor/jpa/BatchQueryExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BatchQueryExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BatchQueryExecutor.java index 8f3b1e9..2d93dbe 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/BatchQueryExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/BatchQueryExecutor.java @@ -124,7 +124,7 @@ public class BatchQueryExecutor { (SLASummaryQuery) entry.getQueryName(), (SLASummaryBean) entry.getBean(), em); } else { - throw new JPAExecutorException(ErrorCode.E0603, "BatchQueryExecutor faield to construct a query"); + throw new JPAExecutorException(ErrorCode.E0603, "BatchQueryExecutor failed to construct a query"); } queryList.add(new QueryEntry(entry.getQueryName(), query)); } http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/core/src/main/java/org/apache/oozie/service/HCatAccessorService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/HCatAccessorService.java b/core/src/main/java/org/apache/oozie/service/HCatAccessorService.java index 249b663..808eb6f 100644 --- a/core/src/main/java/org/apache/oozie/service/HCatAccessorService.java +++ b/core/src/main/java/org/apache/oozie/service/HCatAccessorService.java @@ -81,8 +81,8 @@ public class HCatAccessorService implements Service { try { loadHCatConf(services); } catch(IOException ioe) { - throw new ServiceException(ErrorCode.E0100, HCatAccessorService.class.getName(), "An exception occured while attempting" - + "to load the HCat Configuration", ioe); + throw new ServiceException(ErrorCode.E0100, HCatAccessorService.class.getName(), "An exception occurred" + + " while attempting to load the HCat Configuration", ioe); } } http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/core/src/main/java/org/apache/oozie/service/JMSAccessorService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/JMSAccessorService.java b/core/src/main/java/org/apache/oozie/service/JMSAccessorService.java index e6dc440..4f50f68 100644 --- a/core/src/main/java/org/apache/oozie/service/JMSAccessorService.java +++ b/core/src/main/java/org/apache/oozie/service/JMSAccessorService.java @@ -134,7 +134,7 @@ public class JMSAccessorService implements Service { * @param topic Topic in which the JMS messages are published */ public void unregisterFromNotification(JMSConnectionInfo connInfo, String topic) { - LOG.info("Unregistering JMS listener. Clossing session for {0} and topic {1}", connInfo, topic); + LOG.info("Unregistering JMS listener. Closing session for {0} and topic {1}", connInfo, topic); if (isTopicInRetryList(connInfo, topic)) { removeTopicFromRetryList(connInfo, topic); http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/core/src/test/java/org/apache/oozie/command/coord/TestCoordCommandUtils.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordCommandUtils.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordCommandUtils.java index 6df4e41..6f0373d 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordCommandUtils.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordCommandUtils.java @@ -443,7 +443,7 @@ public class TestCoordCommandUtils extends XDataTestCase { } catch (Exception e) { assertTrue(e.getCause().getMessage() - .contains("intial-instance should be equal or earlier than the start-instance")); + .contains("initial-instance should be equal or earlier than the start-instance")); } try { @@ -576,7 +576,7 @@ public class TestCoordCommandUtils extends XDataTestCase { catch (Exception e) { e.printStackTrace(System.out); assertTrue(e.getCause().getMessage() - .contains("intial-instance should be equal or earlier than the start-instance")); + .contains("initial-instance should be equal or earlier than the start-instance")); } } @@ -665,7 +665,7 @@ public class TestCoordCommandUtils extends XDataTestCase { catch (Exception e) { e.printStackTrace(System.out); assertTrue(e.getCause().getMessage() - .contains("intial-instance should be equal or earlier than the start-instance")); + .contains("initial-instance should be equal or earlier than the start-instance")); } } @@ -749,7 +749,7 @@ public class TestCoordCommandUtils extends XDataTestCase { } catch (Exception e) { assertTrue(e.getCause().getMessage() - .contains("intial-instance should be equal or earlier than the start-instance")); + .contains("initial-instance should be equal or earlier than the start-instance")); } } http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 2542f33..9eb90db 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.4.0 release (trunk - unreleased) +OOZIE-2750 Spelling errors in the log messages and exception messages (gsohn via rkanter) OOZIE-2807 Oozie gets RM delegation token even for checking job status (satishsaley) OOZIE-1887 Remove the utils dir (kvntrieu via rkanter) OOZIE-2540 Create a PySpark example (abhishekbafna via rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java b/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java index a7253d7..0b024e8 100644 --- a/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java +++ b/server/src/main/java/org/apache/oozie/server/SSLServerConnectorFactory.java @@ -92,7 +92,7 @@ class SSLServerConnectorFactory { secureServerConnector.setPort(oozieHttpsPort); - LOG.info(String.format("Secure server connector created, listenning on port %d", oozieHttpsPort)); + LOG.info(String.format("Secure server connector created, listening on port %d", oozieHttpsPort)); return secureServerConnector; } http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java ---------------------------------------------------------------------- diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java index 8087178..7ae48e1 100644 --- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java +++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMain.java @@ -184,11 +184,11 @@ public abstract class LauncherMain { OozieActionConfigurator actionConfigurator = actionConfiguratorKlass.newInstance(); actionConfigurator.configure(actionConf); } catch (ClassNotFoundException e) { - throw new OozieActionConfiguratorException("An Exception occured while instantiating the action config class", e); + throw new OozieActionConfiguratorException("An Exception occurred while instantiating the action config class", e); } catch (InstantiationException e) { - throw new OozieActionConfiguratorException("An Exception occured while instantiating the action config class", e); + throw new OozieActionConfiguratorException("An Exception occurred while instantiating the action config class", e); } catch (IllegalAccessException e) { - throw new OozieActionConfiguratorException("An Exception occured while instantiating the action config class", e); + throw new OozieActionConfiguratorException("An Exception occurred while instantiating the action config class", e); } } } http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java ---------------------------------------------------------------------- diff --git a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java index 0c47ac8..ba393ee 100644 --- a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java +++ b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java @@ -121,7 +121,7 @@ public class PigMain extends LauncherMain { System.setProperty("mapreduce.job.credentials.binary", jobTokenFile); } else { - System.out.println("Non-kerberoes execution"); + System.out.println("Non-kerberos execution"); } //setting oozie workflow id as caller context id for pig http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMainWithOldAPI.java ---------------------------------------------------------------------- diff --git a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMainWithOldAPI.java b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMainWithOldAPI.java index b84e2b5..14ab65e 100644 --- a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMainWithOldAPI.java +++ b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMainWithOldAPI.java @@ -96,7 +96,7 @@ public class PigMainWithOldAPI extends LauncherMain { System.setProperty("mapreduce.job.credentials.binary", jobTokenFile); } else { - System.out.println("Non-kerberoes execution"); + System.out.println("Non-kerberos execution"); } OutputStream os = new FileOutputStream("pig.properties"); http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java ---------------------------------------------------------------------- diff --git a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java index c7860be..5f9f38e 100644 --- a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java +++ b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java @@ -615,7 +615,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase { final Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, context.getActionDir(), context.getProtoActionConf()); Properties errorProps = PropertiesUtils.stringToProperties(actionData.get(LauncherMapper.ACTION_DATA_ERROR_PROPS)); - assertEquals("An Exception occured while instantiating the action config class", + assertEquals("An Exception occurred while instantiating the action config class", errorProps.getProperty("exception.message")); assertTrue(errorProps.getProperty("exception.stacktrace").startsWith(OozieActionConfiguratorException.class.getName())); } http://git-wip-us.apache.org/repos/asf/oozie/blob/2b655d74/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java ---------------------------------------------------------------------- diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java index ce19e80..a8b2234 100644 --- a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java +++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java @@ -286,7 +286,7 @@ public class OozieDBCLI { postUpgradeDBTo40(sqlFile, run); } else { - System.out.println("No Post ugprade updates available for " + version); + System.out.println("No Post upgrade updates available for " + version); } } @@ -300,7 +300,7 @@ public class OozieDBCLI { postUpgradeTasks(sqlFile, run, true); if (run) { System.out.println(); - System.out.println("Post ugprade updates have been executed"); + System.out.println("Post upgrade updates have been executed"); } System.out.println(); }
