Skip to content

Commit

Permalink
ZOOKEEPER-3073: fix couple of typos
Browse files Browse the repository at this point in the history
Author: Christine Poerschke <[email protected]>

Reviewers: Norbert Kalmar <[email protected]>, 毛蛤丝 <[email protected]>, Benjamin Reed <[email protected]>

Closes #554 from cpoerschke/master-ZOOKEEPER-3073
  • Loading branch information
cpoerschke authored and breed committed Jul 10, 2018
1 parent 32e4a16 commit 5fdd70a
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions docs/releasenotes.html
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,11 @@ <h3 class="h4">Migrating Client Code</h3>
<h4>Watch Management</h4>
<p>
In previous releases of ZooKeeper any watches registered by clients were lost if the client lost a connection to a ZooKeeper server.
This meant that developers had to track watches they were interested in and reregister them if a session disconnect event was recieved.
This meant that developers had to track watches they were interested in and reregister them if a session disconnect event was received.
In this release the client library tracks watches that a client has registered and reregisters the watches when a connection is made to a new server.
Applications that still manually reregister interest should continue working properly as long as they are able to handle unsolicited watches.
For example, an old application may register a watch for /foo and /goo, lose the connection, and reregister only /goo.
As long as the application is able to recieve a notification for /foo, (probably ignoring it) it does not need to be changed.
As long as the application is able to receive a notification for /foo, (probably ignoring it) it does not need to be changed.
One caveat to the watch management: it is possible to miss an event for the creation and deletion of a znode if watching for creation and both the create and delete happens while the client is disconnected from ZooKeeper.
</p>
<p>
Expand Down
2 changes: 1 addition & 1 deletion src/c/acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# aminclude.m4 file and a compatible doxygen configuration file. Defines the
# following public macros:
#
# DX_???_FEATURE(ON|OFF) - control the default setting fo a Doxygen feature.
# DX_???_FEATURE(ON|OFF) - control the default setting of a Doxygen feature.
# Supported features are 'DOXYGEN' itself, 'DOT' for generating graphics,
# 'HTML' for plain HTML, 'CHM' for compressed HTML help (for MS users), 'CHI'
# for generating a seperate .chi file by the .chm file, and 'MAN', 'RTF',
Expand Down
2 changes: 1 addition & 1 deletion src/java/main/org/apache/jute/OutputArchive.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.TreeMap;

/**
* Interface that alll the serializers have to implement.
* Interface that all the serializers have to implement.
*
*/
public interface OutputArchive {
Expand Down
2 changes: 1 addition & 1 deletion src/java/main/org/apache/zookeeper/ClientCnxnSocket.java
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void updateLastSendAndHeard() {
protected void readLength() throws IOException {
int len = incomingBuffer.getInt();
if (len < 0 || len >= packetLen) {
throw new IOException("Packet len" + len + " is out of range!");
throw new IOException("Packet len " + len + " is out of range!");
}
incomingBuffer = ByteBuffer.allocate(len);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public CliCommand parse(String[] cmdArgs) throws CliParseException {
@Override
public boolean exec() throws CliException {
//if neither option -n or -b is specified, we delete
// the quota node for thsi node.
// the quota node for this node.
String path = args[1];
try {
if (cl.hasOption("b")) {
Expand Down
2 changes: 1 addition & 1 deletion src/java/main/org/apache/zookeeper/server/DataTree.java
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public class DataTree {
.substring(procZookeeper.length() + 1);

/**
* the path trie that keeps track fo the quota nodes in this datatree
* the path trie that keeps track of the quota nodes in this datatree
*/
private final PathTrie pTrie = new PathTrie();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public static void startInstance(InstanceManager im, String quorumHostPort, int
/**
* Stop an instance of the quorumPeer
* @param im the manager of the instance
* @param index the zero based index fo the server to stop
* @param index the zero based index of the server to stop
* @throws InterruptedException
* @throws KeeperException
* @throws NoAssignmentException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public void testLoad() throws Exception {
hdr = itr.getHeader();
expectedZxid++;
Assert.assertTrue("not the same transaction. lastZxid=" + lastZxid + ", zxid=" + hdr.getZxid(), lastZxid != hdr.getZxid());
Assert.assertTrue("excepting next transaction. expected=" + expectedZxid + ", retreived=" + hdr.getZxid(), (hdr.getZxid() == expectedZxid));
Assert.assertTrue("excepting next transaction. expected=" + expectedZxid + ", retrieved=" + hdr.getZxid(), (hdr.getZxid() == expectedZxid));
lastZxid = hdr.getZxid();
}while(itr.next());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ public void processResult(int rc, String path, Object ctx,
}
for (int i = 0; i < res.results.size(); i++) {
OpResult opResult = res.results.get(i);
Assert.assertTrue("Did't recieve proper error response",
Assert.assertTrue("Did't receive proper error response",
opResult instanceof ErrorResult);
ErrorResult errRes = (ErrorResult) opResult;
Assert.assertEquals("Did't recieve proper error code",
Assert.assertEquals("Did't receive proper error code",
expectedResultCodes.get(i).intValue(), errRes.getErr());
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/recipes/lock/src/c/acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# aminclude.m4 file and a compatible doxygen configuration file. Defines the
# following public macros:
#
# DX_???_FEATURE(ON|OFF) - control the default setting fo a Doxygen feature.
# DX_???_FEATURE(ON|OFF) - control the default setting of a Doxygen feature.
# Supported features are 'DOXYGEN' itself, 'DOT' for generating graphics,
# 'HTML' for plain HTML, 'CHM' for compressed HTML help (for MS users), 'CHI'
# for generating a seperate .chi file by the .chm file, and 'MAN', 'RTF',
Expand Down
2 changes: 1 addition & 1 deletion src/recipes/queue/src/c/acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# aminclude.m4 file and a compatible doxygen configuration file. Defines the
# following public macros:
#
# DX_???_FEATURE(ON|OFF) - control the default setting fo a Doxygen feature.
# DX_???_FEATURE(ON|OFF) - control the default setting of a Doxygen feature.
# Supported features are 'DOXYGEN' itself, 'DOT' for generating graphics,
# 'HTML' for plain HTML, 'CHM' for compressed HTML help (for MS users), 'CHI'
# for generating a seperate .chi file by the .chm file, and 'MAN', 'RTF',
Expand Down

0 comments on commit 5fdd70a

Please sign in to comment.