Skip to content
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

Jump to bottom

ISPN-2581 StateTransferManagerImpl.waitForInitialStateTransferToComplete... #1605

Merged
merged 1 commit into from Jan 24, 2013
Merged

ISPN-2581 StateTransferManagerImpl.waitForInitialStateTransferToComplete... #1605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 6 additions & 9 deletions core/src/main/java/org/infinispan/statetransfer/StateTransferManagerImpl.java
View file
Open in desktop
Expand Up @@ -196,10 +196,12 @@ private void doTopologyUpdate(CacheTopology newCacheTopology, boolean isRebalanc

cacheNotifier.notifyTopologyChanged(oldCH, newCH, newCacheTopology.getTopologyId(), false);

boolean isJoined = stateConsumer.getCacheTopology().getReadConsistentHash().getMembers().contains(rpcManager.getAddress());
if (initialStateTransferComplete.getCount() > 0 && isJoined) {
initialStateTransferComplete.countDown();
log.tracef("Initial state transfer complete for cache %s on node %s", cacheName, rpcManager.getAddress());
if (initialStateTransferComplete.getCount() > 0) {
boolean isJoined = stateConsumer.getCacheTopology().getReadConsistentHash().getMembers().contains(rpcManager.getAddress());
if (isJoined) {
initialStateTransferComplete.countDown();
log.tracef("Initial state transfer complete for cache %s on node %s", cacheName, rpcManager.getAddress());
}
}
}

Expand Down Expand Up @@ -288,11 +290,6 @@ public void forwardCommandIfNeeded(TopologyAffectedCommand command, Set<Object>

@Override
public void notifyEndOfTopologyUpdate(int topologyId) {
if (initialStateTransferComplete.getCount() > 0
&& stateConsumer.getCacheTopology().getWriteConsistentHash().getMembers().contains(rpcManager.getAddress())) {
initialStateTransferComplete.countDown();
log.tracef("Initial state transfer complete for cache %s on node %s", cacheName, rpcManager.getAddress());
}
localTopologyManager.confirmRebalance(cacheName, topologyId, null);
}
}