From 0816970930bb9565f13d310a1f55636e62cdfd19 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Tue, 14 Feb 2017 13:53:32 +0530 Subject: [PATCH] ZOOKEEPER-2617: correct a few spelling typos Hi - this PR contains corrections for some spelling typos. Most of them appear in comments, but a few appear in documentation and program output. Thank you for considering it. Author: tony mancill Reviewers: Flavio Junqueira , Edward Ribeiro , Rakesh Radhakrishnan Closes #87 from tmancill/tmancill/spelling-typos Author: Edward Ribeiro Reviewers: Rakesh Radhakrishnan Closes #174 from eribeiro/ZOOKEEPER-2617 --- src/c/include/zookeeper.h | 14 +++++++------- src/contrib/zkpython/src/c/pyzk_docstrings.h | 6 +++--- src/contrib/zkpython/src/c/zookeeper.c | 4 ++-- src/contrib/zktreeutil/src/ZkAdaptor.cc | 2 +- src/contrib/zktreeutil/src/ZkAdaptor.h | 2 +- src/contrib/zktreeutil/src/ZkTreeUtil.cc | 2 +- .../inspector/manager/ZooInspectorManagerImpl.java | 4 ++-- src/docs/src/documentation/conf/cli.xconf | 2 +- .../content/xdocs/zookeeperProgrammers.xml | 2 +- .../zookeeper/server/DatadirCleanupManager.java | 2 +- .../apache/zookeeper/server/ZooKeeperThread.java | 2 +- .../org/apache/zookeeper/server/PurgeTxnTest.java | 6 +++--- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/c/include/zookeeper.h b/src/c/include/zookeeper.h index 973daa4caab..799e67246b5 100644 --- a/src/c/include/zookeeper.h +++ b/src/c/include/zookeeper.h @@ -591,8 +591,8 @@ ZOOAPI const char* zoo_get_current_server(zhandle_t* zh); * ZBADARGUMENTS - invalid input parameters * ZMARSHALLINGERROR - failed to marshall a request; possibly, out of memory * ZOPERATIONTIMEOUT - failed to flush the buffers within the specified timeout. - * ZCONNECTIONLOSS - a network error occured while attempting to send request to server - * ZSYSTEMERROR -- a system (OS) error occured; it's worth checking errno to get details + * ZCONNECTIONLOSS - a network error occurred while attempting to send request to server + * ZSYSTEMERROR -- a system (OS) error occurred; it's worth checking errno to get details */ ZOOAPI int zookeeper_close(zhandle_t *zh); @@ -646,12 +646,12 @@ ZOOAPI struct sockaddr* zookeeper_get_connected_host(zhandle_t *zh, * ZOK - success * ZBADARGUMENTS - invalid input parameters * ZINVALIDSTATE - zhandle state is either ZOO_SESSION_EXPIRED_STATE or ZOO_AUTH_FAILED_STATE - * ZCONNECTIONLOSS - a network error occured while attempting to establish + * ZCONNECTIONLOSS - a network error occurred while attempting to establish * a connection to the server * ZMARSHALLINGERROR - failed to marshall a request; possibly, out of memory * ZOPERATIONTIMEOUT - hasn't received anything from the server for 2/3 of the * timeout value specified in zookeeper_init() - * ZSYSTEMERROR -- a system (OS) error occured; it's worth checking errno to get details + * ZSYSTEMERROR -- a system (OS) error occurred; it's worth checking errno to get details */ #ifdef WIN32 ZOOAPI int zookeeper_interest(zhandle_t *zh, SOCKET *fd, int *interest, @@ -670,11 +670,11 @@ ZOOAPI int zookeeper_interest(zhandle_t *zh, int *fd, int *interest, * ZOK - success * ZBADARGUMENTS - invalid input parameters * ZINVALIDSTATE - zhandle state is either ZOO_SESSION_EXPIRED_STATE or ZOO_AUTH_FAILED_STATE - * ZCONNECTIONLOSS - a network error occured while attempting to send request to server + * ZCONNECTIONLOSS - a network error occurred while attempting to send request to server * ZSESSIONEXPIRED - connection attempt failed -- the session's expired * ZAUTHFAILED - authentication request failed, e.i. invalid credentials * ZRUNTIMEINCONSISTENCY - a server response came out of order - * ZSYSTEMERROR -- a system (OS) error occured; it's worth checking errno to get details + * ZSYSTEMERROR -- a system (OS) error occurred; it's worth checking errno to get details * ZNOTHING -- not an error; simply indicates that there no more data from the server * to be processed (when called with ZOOKEEPER_READ flag). */ @@ -1436,7 +1436,7 @@ ZOOAPI const char* zerror(int c); * ZBADARGUMENTS - invalid input parameters * ZINVALIDSTATE - zhandle state is either ZOO_SESSION_EXPIRED_STATE or ZOO_AUTH_FAILED_STATE * ZMARSHALLINGERROR - failed to marshall a request; possibly, out of memory - * ZSYSTEMERROR - a system error occured + * ZSYSTEMERROR - a system error occurred */ ZOOAPI int zoo_add_auth(zhandle_t *zh,const char* scheme,const char* cert, int certLen, void_completion_t completion, const void *data); diff --git a/src/contrib/zkpython/src/c/pyzk_docstrings.h b/src/contrib/zkpython/src/c/pyzk_docstrings.h index d2c4d60f6a4..1f38d53fc74 100644 --- a/src/contrib/zkpython/src/c/pyzk_docstrings.h +++ b/src/contrib/zkpython/src/c/pyzk_docstrings.h @@ -276,7 +276,7 @@ const char pyzk_add_auth_doc[] = "BADARGUMENTS - invalid input parameters\n" "INVALIDSTATE - zhandle state is either SESSION_EXPIRED_STATE or AUTH_FAILED_STATE\n" "MARSHALLINGERROR - failed to marshall a request; possibly, out of memory\n" - "SYSTEMERROR - a system error occured\n"; + "SYSTEMERROR - a system error occurred\n"; const char pyzk_is_unrecoverable_doc[] = " checks if the current zookeeper connection state can't be recovered.\n" @@ -513,8 +513,8 @@ static const char pyzk_close_doc[] = "BADARGUMENTS - invalid input parameters\n" "MARSHALLINGERROR - failed to marshall a request; possibly, out of memory\n" "OPERATIONTIMEOUT - failed to flush the buffers within the specified timeout.\n" -"CONNECTIONLOSS - a network error occured while attempting to send request to server\n" - "SYSTEMERROR -- a system (OS) error occured; it's worth checking errno to get details\n"; +"CONNECTIONLOSS - a network error occurred while attempting to send request to server\n" + "SYSTEMERROR -- a system (OS) error occurred; it's worth checking errno to get details\n"; static const char pyzk_set2_doc[] = "\n" diff --git a/src/contrib/zkpython/src/c/zookeeper.c b/src/contrib/zkpython/src/c/zookeeper.c index 0bf6c59c28e..4474661860a 100644 --- a/src/contrib/zkpython/src/c/zookeeper.c +++ b/src/contrib/zkpython/src/c/zookeeper.c @@ -721,7 +721,7 @@ PyObject *pyzoo_adelete(PyObject *self, PyObject *args) return Py_BuildValue("i", err); } -/* Asynchronous node existance check, returns integer error code */ +/* Asynchronous node existence check, returns integer error code */ PyObject *pyzoo_aexists(PyObject *self, PyObject *args) { int zkhid; char *path; @@ -1059,7 +1059,7 @@ static PyObject *pyzoo_delete(PyObject *self, PyObject *args) return Py_BuildValue("i", err); } -/* Synchronous node existance check, returns stat if exists, None if +/* Synchronous node existence check, returns stat if exists, None if absent */ static PyObject *pyzoo_exists(PyObject *self, PyObject *args) { diff --git a/src/contrib/zktreeutil/src/ZkAdaptor.cc b/src/contrib/zktreeutil/src/ZkAdaptor.cc index baec8f9b0fa..1df175a9bac 100644 --- a/src/contrib/zktreeutil/src/ZkAdaptor.cc +++ b/src/contrib/zktreeutil/src/ZkAdaptor.cc @@ -445,7 +445,7 @@ namespace zktreeutil if (rc == ZNONODE) return false; // Some error - std::cerr << "[zktreeutil] Error in checking existance of " << path << std::endl; + std::cerr << "[zktreeutil] Error in checking existence of " << path << std::endl; throw ZooKeeperException( string("Unable to check existence of node ") + path, rc ); } else { return true; diff --git a/src/contrib/zktreeutil/src/ZkAdaptor.h b/src/contrib/zktreeutil/src/ZkAdaptor.h index d94b033c51b..4b68e28db1f 100644 --- a/src/contrib/zktreeutil/src/ZkAdaptor.h +++ b/src/contrib/zktreeutil/src/ZkAdaptor.h @@ -255,7 +255,7 @@ namespace zktreeutil vector getNodeChildren( const string &path) throw(ZooKeeperException); /** - * \brief Check the existance of path to a znode. + * \brief Check the existence of path to a znode. * * @param path the absolute path name of the znode * @return TRUE if the znode exists; FALSE otherwise diff --git a/src/contrib/zktreeutil/src/ZkTreeUtil.cc b/src/contrib/zktreeutil/src/ZkTreeUtil.cc index 83f0cbf3f94..270bf3105c7 100644 --- a/src/contrib/zktreeutil/src/ZkTreeUtil.cc +++ b/src/contrib/zktreeutil/src/ZkTreeUtil.cc @@ -347,7 +347,7 @@ namespace zktreeutil std::cerr << "[zktreeutil] connected to ZK serverfor reading" << std::endl; - // Check the existance of the path to znode + // Check the existence of the path to znode if (!zkHandle->nodeExists (path)) { string errMsg = string("[zktreeutil] path does not exists : ") + path; diff --git a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java b/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java index 26beb4a4c54..57cdd95c0e0 100644 --- a/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java +++ b/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorManagerImpl.java @@ -612,7 +612,7 @@ public void addWatchers(Collection selectedNodes, zooKeeper)); } catch (Exception e) { LoggerFactory.getLogger().error( - "Error occured adding node watcher for node: " + "Error occurred adding node watcher for node: " + node, e); } } @@ -687,7 +687,7 @@ public void process(WatchedEvent event) { } } catch (Exception e) { LoggerFactory.getLogger().error( - "Error occured re-adding node watcherfor node " + "Error occurred re-adding node watcherfor node " + nodePath, e); } nodeListener.processEvent(event.getPath(), event.getType() diff --git a/src/docs/src/documentation/conf/cli.xconf b/src/docs/src/documentation/conf/cli.xconf index 99eedf583c1..c6713408245 100644 --- a/src/docs/src/documentation/conf/cli.xconf +++ b/src/docs/src/documentation/conf/cli.xconf @@ -98,7 +98,7 @@ | | | Two attributes to this node specify whether a page should - | be generated when an error has occured. 'generate' specifies + | be generated when an error has occurred. 'generate' specifies | whether a page should be generated (default: true) and | extension specifies an extension that should be appended | to the generated page's filename (default: none) diff --git a/src/docs/src/documentation/content/xdocs/zookeeperProgrammers.xml b/src/docs/src/documentation/content/xdocs/zookeeperProgrammers.xml index f462551ced5..b4477bfd1e3 100644 --- a/src/docs/src/documentation/content/xdocs/zookeeperProgrammers.xml +++ b/src/docs/src/documentation/content/xdocs/zookeeperProgrammers.xml @@ -1692,7 +1692,7 @@ authProvider.2=com.f.MyAuth2 If you are using watches, you must look for the connected watch event. When a ZooKeeper client disconnects from a server, you will not receive notification of changes until reconnected. If you are - watching for a znode to come into existance, you will miss the event + watching for a znode to come into existence, you will miss the event if the znode is created and deleted while you are disconnected. diff --git a/src/java/main/org/apache/zookeeper/server/DatadirCleanupManager.java b/src/java/main/org/apache/zookeeper/server/DatadirCleanupManager.java index bd928cb36cc..4a6d1a215ca 100644 --- a/src/java/main/org/apache/zookeeper/server/DatadirCleanupManager.java +++ b/src/java/main/org/apache/zookeeper/server/DatadirCleanupManager.java @@ -139,7 +139,7 @@ public void run() { try { PurgeTxnLog.purge(logsDir, snapsDir, snapRetainCount); } catch (Exception e) { - LOG.error("Error occured while purging.", e); + LOG.error("Error occurred while purging.", e); } LOG.info("Purge task completed."); } diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperThread.java b/src/java/main/org/apache/zookeeper/server/ZooKeeperThread.java index 5f11ebcc88a..189adaff76d 100644 --- a/src/java/main/org/apache/zookeeper/server/ZooKeeperThread.java +++ b/src/java/main/org/apache/zookeeper/server/ZooKeeperThread.java @@ -52,6 +52,6 @@ public ZooKeeperThread(String threadName) { * - exception object */ protected void handleException(String thName, Throwable e) { - LOG.warn("Exception occured from thread {}", thName, e); + LOG.warn("Exception occurred from thread {}", thName, e); } } diff --git a/src/java/test/org/apache/zookeeper/server/PurgeTxnTest.java b/src/java/test/org/apache/zookeeper/server/PurgeTxnTest.java index f7c035eb8be..7898e6eaafe 100644 --- a/src/java/test/org/apache/zookeeper/server/PurgeTxnTest.java +++ b/src/java/test/org/apache/zookeeper/server/PurgeTxnTest.java @@ -570,7 +570,7 @@ public void run() { zk.create(mynode, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); } catch (Exception e) { - LOG.error("Unexpected exception occured!", e); + LOG.error("Unexpected exception occurred!", e); } if (i == 200) { doPurge.countDown(); @@ -589,8 +589,8 @@ public void run() { Assert.assertTrue("ZkClient ops is not finished!", finished.await(OP_TIMEOUT_IN_MILLIS, TimeUnit.MILLISECONDS)); } catch (InterruptedException ie) { - LOG.error("Unexpected exception occured!", ie); - Assert.fail("Unexpected exception occured!"); + LOG.error("Unexpected exception occurred!", ie); + Assert.fail("Unexpected exception occurred!"); } return znodes; }