Skip to content

CURATOR-241: Write updated data on reconnect #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 3 commits into from
Aug 11, 2015
Merged

CURATOR-241: Write updated data on reconnect #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fd4034
CURATOR-241: Write updated data on reconnect
alexbrasetvik Aug 2, 2015
5cfa483
Make getData private and access data directly in setData
alexbrasetvik Aug 2, 2015
f3ff7e7
Access data the same way
alexbrasetvik Aug 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...pes/src/main/java/org/apache/curator/framework/recipes/nodes/PersistentEphemeralNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ else if ( event.getResultCode() == KeeperException.Code.OK.intValue() )

if(nodeExists)
{
client.setData().inBackground(setDataCallback).forPath(getActualPath(), data);
client.setData().inBackground(setDataCallback).forPath(getActualPath(), getData());
}
else
{
Expand Down Expand Up @@ -338,10 +338,14 @@ public void setData(byte[] data) throws Exception
this.data.set(Arrays.copyOf(data, data.length));
if ( isActive() )
{
client.setData().inBackground().forPath(getActualPath(), this.data.get());
client.setData().inBackground().forPath(getActualPath(), getData());
Copy link
Copy Markdown
Contributor

@cammckenzie cammckenzie Aug 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that this change isn't required as the data is being accessed directly from within this method.

Copy link
Copy Markdown
Contributor Author

@alexbrasetvik alexbrasetvik Aug 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed it so it was the same both places actually getting the data, but can revert this change. :)

Copy link
Copy Markdown
Contributor

@cammckenzie cammckenzie Aug 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, fair enough. Leave it as is, it's probably nicer to have the data accessed in the same way.

}
}

private byte[] getData() {
return this.data.get();
}

private void deleteNode() throws Exception
{
String localNodePath = nodePath.getAndSet(null);
Expand Down
41 changes: 41 additions & 0 deletions ...src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.framework.api.BackgroundCallback;
import org.apache.curator.framework.api.CuratorEvent;
import org.apache.curator.framework.state.ConnectionState;
import org.apache.curator.framework.state.ConnectionStateListener;
import org.apache.curator.retry.RetryOneTime;
Expand Down Expand Up @@ -536,6 +538,45 @@ public void process(WatchedEvent event)
node.close();
}
}

@Test
public void testSetUpdatedDataWhenReconnected() throws Exception
{
CuratorFramework curator = newCurator();

byte[] initialData = "Hello World".getBytes();
byte[] updatedData = "Updated".getBytes();

PersistentEphemeralNode node = new PersistentEphemeralNode(curator, PersistentEphemeralNode.Mode.EPHEMERAL, PATH, initialData);
node.start();
try
{
node.waitForInitialCreate(timing.forWaiting().seconds(), TimeUnit.SECONDS);
assertTrue(Arrays.equals(curator.getData().forPath(node.getActualPath()), initialData));

node.setData(updatedData);
assertTrue(Arrays.equals(curator.getData().forPath(node.getActualPath()), updatedData));

server.restart();

final CountDownLatch dataUpdateLatch = new CountDownLatch(1);
curator.getData().inBackground(new BackgroundCallback() {

@Override
public void processResult(CuratorFramework client, CuratorEvent event) throws Exception {
dataUpdateLatch.countDown();
}
}).forPath(node.getActualPath());

assertTrue(timing.awaitLatch(dataUpdateLatch));

assertTrue(Arrays.equals(curator.getData().forPath(node.getActualPath()), updatedData));
}
finally
{
node.close();
}
}

/**
* See CURATOR-190
Expand Down