Skip to content

Commit

Permalink
ZOOKEEPER-2617: correct a few spelling typos
Browse files Browse the repository at this point in the history
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 <tmancill@debian.org>

Reviewers: Flavio Junqueira <fpj@apache.org>, Edward Ribeiro <edward.ribeiro@gmail.com>, Rakesh Radhakrishnan <rakeshr@apache.org>

Closes #87 from tmancill/tmancill/spelling-typos
  • Loading branch information
tmancill authored and rakeshadr committed Feb 13, 2017
1 parent 07a1286 commit e51dbeb
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 25 deletions.
14 changes: 7 additions & 7 deletions src/c/include/zookeeper.h
Expand Up @@ -468,8 +468,8 @@ ZOOAPI zhandle_t *zookeeper_init(const char *host, watcher_fn fn,
* 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);

Expand Down Expand Up @@ -523,12 +523,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,
Expand All @@ -547,11 +547,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).
*/
Expand Down Expand Up @@ -1166,7 +1166,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);
Expand Down
2 changes: 1 addition & 1 deletion src/c/src/load_gen.c
Expand Up @@ -256,7 +256,7 @@ int main(int argc, char **argv) {
deletedCounter=0;
rc=recursiveDelete(argv[2]);
if(rc==ZOK){
LOG_INFO(("Succesfully deleted a subtree starting at %s (%d nodes)",
LOG_INFO(("Successfully deleted a subtree starting at %s (%d nodes)",
argv[2],deletedCounter));
exit(0);
}
Expand Down
6 changes: 3 additions & 3 deletions src/contrib/zkpython/src/c/pyzk_docstrings.h
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/contrib/zkpython/src/c/zookeeper.c
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/contrib/zktreeutil/src/ZkAdaptor.cc
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/contrib/zktreeutil/src/ZkAdaptor.h
Expand Up @@ -255,7 +255,7 @@ namespace zktreeutil
vector<string> 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
Expand Down
2 changes: 1 addition & 1 deletion src/contrib/zktreeutil/src/ZkTreeUtil.cc
Expand Up @@ -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;
Expand Down
Expand Up @@ -625,7 +625,7 @@ public void addWatchers(Collection<String> selectedNodes,
zooKeeper));
} catch (Exception e) {
LoggerFactory.getLogger().error(
"Error occured adding node watcher for node: "
"Error occurred adding node watcher for node: "
+ node, e);
}
}
Expand Down Expand Up @@ -700,7 +700,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()
Expand Down
2 changes: 1 addition & 1 deletion src/docs/src/documentation/conf/cli.xconf
Expand Up @@ -98,7 +98,7 @@
| <broken-links type="none"/>
|
| 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)
Expand Down
Expand Up @@ -1506,7 +1506,7 @@ authProvider.2=com.f.MyAuth2
<para>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.</para>
</listitem>

Expand Down
Expand Up @@ -139,7 +139,7 @@ public void run() {
try {
PurgeTxnLog.purge(new File(logsDir), new File(snapsDir), snapRetainCount);
} catch (Exception e) {
LOG.error("Error occured while purging.", e);
LOG.error("Error occurred while purging.", e);
}
LOG.info("Purge task completed.");
}
Expand Down
Expand Up @@ -57,6 +57,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);
}
}
6 changes: 3 additions & 3 deletions src/java/test/org/apache/zookeeper/server/PurgeTxnTest.java
Expand Up @@ -572,7 +572,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();
Expand All @@ -591,8 +591,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;
}
Expand Down

0 comments on commit e51dbeb

Please sign in to comment.