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

TDB-19133 : If invalidations are not claimed by reconnect clients, then don't attempt to fire invalidation completion messages #3251

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

TDB-19133 : If invalidations are not claimed by reconnect clients, then don't attempt to fire invalidation completion messages #3251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d87facd
TDB-19133 : If invalidations are not claimed by reconnect clients, th…
chrisdennis Nov 20, 2024
f49d473
Merge commit 'a280de9b844eae8c62127ddd9aa79ca92e52afb1' into invalida…
chrisdennis Nov 20, 2024
3e19051
Merge commit 'e0f494e942b1be285c0cb822da619a7df0eaaf9c' into invalida…
chrisdennis Nov 20, 2024
02db75a
Merge commit 'c883b4f64b23028e65ac22dfb7ca97b4f03cd3a7' into invalida…
chrisdennis Feb 21, 2025
e6bbd0a
Merge commit 'c2a16a786f7c12dba9627bdeacf12c1835d3a441' into invalida…
chrisdennis Feb 21, 2025
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
122 changes: 69 additions & 53 deletions ...ache-entity/src/main/java/org/ehcache/clustered/server/store/ClusterTierActiveEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,65 +603,60 @@ private void invalidateAll(ClientDescriptor originatingClientDescriptor) {
clientsToInvalidate.remove(originatingClientDescriptor);
}

InvalidationHolder invalidationHolder = new InvalidationHolder(originatingClientDescriptor, clientsToInvalidate);
clientsWaitingForInvalidation.put(invalidationId, invalidationHolder);

LOGGER.debug("SERVER: requesting {} client(s) invalidation of all in cache {} (ID {})", clientsToInvalidate.size(), storeIdentifier, invalidationId);
for (ClientDescriptor clientDescriptorThatHasToInvalidate : clientsToInvalidate) {
LOGGER.debug("SERVER: asking client {} to invalidate all from cache {} (ID {})", clientDescriptorThatHasToInvalidate, storeIdentifier, invalidationId);
try {
clientCommunicator.sendNoResponse(clientDescriptorThatHasToInvalidate, clientInvalidateAll(invalidationId));
} catch (MessageCodecException mce) {
throw new AssertionError("Codec error", mce);

if (clientsToInvalidate.isEmpty()) {
invalidateAllComplete(originatingClientDescriptor, invalidationId);
} else {
InvalidationHolder invalidationHolder = new InvalidationHolder(originatingClientDescriptor, clientsToInvalidate);
clientsWaitingForInvalidation.put(invalidationId, invalidationHolder);
for (ClientDescriptor clientDescriptorThatHasToInvalidate : clientsToInvalidate) {
LOGGER.debug("SERVER: asking client {} to invalidate all from cache {} (ID {})", clientDescriptorThatHasToInvalidate, storeIdentifier, invalidationId);
try {
clientCommunicator.sendNoResponse(clientDescriptorThatHasToInvalidate, clientInvalidateAll(invalidationId));
} catch (MessageCodecException mce) {
throw new AssertionError("Codec error", mce);
}
}
}
}

if (clientsToInvalidate.isEmpty()) {
clientInvalidated(invalidationHolder.clientDescriptorWaitingForInvalidation, invalidationId);
private void invalidateAllComplete(ClientDescriptor initiator, int invalidationId) {
try {
if (isStrong()) {
if (initiator != null) {
clientCommunicator.sendNoResponse(initiator, allInvalidationDone());
LOGGER.debug("SERVER: notifying originating client that all other clients invalidated all in cache {} from {} (ID {})", storeIdentifier, initiator, invalidationId);
}
} else {
entityMessenger.messageSelf(new ClearInvalidationCompleteMessage());

InvalidationTracker invalidationTracker = stateService.getInvalidationTracker(storeIdentifier);
if (invalidationTracker != null) {
invalidationTracker.setClearInProgress(false);
}
}
} catch (MessageCodecException mce) {
throw new AssertionError("Codec error", mce);
}
}

private void clientInvalidated(ClientDescriptor clientDescriptor, int invalidationId) {
InvalidationHolder invalidationHolder = clientsWaitingForInvalidation.get(invalidationId);

if (invalidationHolder == null) { // Happens when client is re-sending/sending invalidations for which server has lost track since fail-over happened.
LOGGER.debug("Ignoring invalidation from client {} " + clientDescriptor);
LOGGER.debug("Ignoring invalidation from client {} ", clientDescriptor);
return;
}

invalidationHolder.clientsHavingToInvalidate.remove(clientDescriptor);
if (invalidationHolder.clientsHavingToInvalidate.isEmpty()) {
if (clientsWaitingForInvalidation.remove(invalidationId) != null) {
try {
Long key = invalidationHolder.key;
if (key == null) {
if (isStrong()) {
clientCommunicator.sendNoResponse(invalidationHolder.clientDescriptorWaitingForInvalidation, allInvalidationDone());
LOGGER.debug("SERVER: notifying originating client that all other clients invalidated all in cache {} from {} (ID {})", storeIdentifier, clientDescriptor, invalidationId);
} else {
entityMessenger.messageSelf(new ClearInvalidationCompleteMessage());

InvalidationTracker invalidationTracker = stateService.getInvalidationTracker(storeIdentifier);
if (invalidationTracker != null) {
invalidationTracker.setClearInProgress(false);
}

}
} else {
if (isStrong()) {
clientCommunicator.sendNoResponse(invalidationHolder.clientDescriptorWaitingForInvalidation, hashInvalidationDone(key));
LOGGER.debug("SERVER: notifying originating client that all other clients invalidated key {} in cache {} from {} (ID {})", key, storeIdentifier, clientDescriptor, invalidationId);
} else {
entityMessenger.messageSelf(new InvalidationCompleteMessage(key));

InvalidationTracker invalidationTracker = stateService.getInvalidationTracker(storeIdentifier);
if (invalidationTracker != null) {
invalidationTracker.untrackHashInvalidation(key);
}
}
}
} catch (MessageCodecException mce) {
throw new AssertionError("Codec error", mce);
Long key = invalidationHolder.key;
if (key == null) {
invalidateAllComplete(invalidationHolder.clientDescriptorWaitingForInvalidation, invalidationId);
} else {
invalidateComplete(invalidationHolder.clientDescriptorWaitingForInvalidation, key, invalidationId);
}
}
}
Expand All @@ -676,21 +671,42 @@ private void invalidateHashForClient(ClientDescriptor originatingClientDescripto
clientsToInvalidate.remove(originatingClientDescriptor);
}

InvalidationHolder invalidationHolder = new InvalidationHolder(originatingClientDescriptor, clientsToInvalidate, key);
clientsWaitingForInvalidation.put(invalidationId, invalidationHolder);

LOGGER.debug("SERVER: requesting {} client(s) invalidation of hash {} in cache {} (ID {})", clientsToInvalidate.size(), key, storeIdentifier, invalidationId);
for (ClientDescriptor clientDescriptorThatHasToInvalidate : clientsToInvalidate) {
LOGGER.debug("SERVER: asking client {} to invalidate hash {} from cache {} (ID {})", clientDescriptorThatHasToInvalidate, key, storeIdentifier, invalidationId);
try {
clientCommunicator.sendNoResponse(clientDescriptorThatHasToInvalidate, clientInvalidateHash(key, invalidationId));
} catch (MessageCodecException mce) {
throw new AssertionError("Codec error", mce);

if (clientsToInvalidate.isEmpty()) {
invalidateComplete(originatingClientDescriptor, key, invalidationId);
} else {
InvalidationHolder invalidationHolder = new InvalidationHolder(originatingClientDescriptor, clientsToInvalidate, key);
clientsWaitingForInvalidation.put(invalidationId, invalidationHolder);

for (ClientDescriptor clientDescriptorThatHasToInvalidate : clientsToInvalidate) {
LOGGER.debug("SERVER: asking client {} to invalidate hash {} from cache {} (ID {})", clientDescriptorThatHasToInvalidate, key, storeIdentifier, invalidationId);
try {
clientCommunicator.sendNoResponse(clientDescriptorThatHasToInvalidate, clientInvalidateHash(key, invalidationId));
} catch (MessageCodecException mce) {
throw new AssertionError("Codec error", mce);
}
}
}
}

if (clientsToInvalidate.isEmpty()) {
clientInvalidated(invalidationHolder.clientDescriptorWaitingForInvalidation, invalidationId);
private void invalidateComplete(ClientDescriptor initiator, long key, int invalidationId) {
try {
if (isStrong()) {
if (initiator != null) {
clientCommunicator.sendNoResponse(initiator, hashInvalidationDone(key));
LOGGER.debug("SERVER: notifying originating client that all other clients invalidated key {} in cache {} from {} (ID {})", key, storeIdentifier, initiator, invalidationId);
}
} else {
entityMessenger.messageSelf(new InvalidationCompleteMessage(key));

InvalidationTracker invalidationTracker = stateService.getInvalidationTracker(storeIdentifier);
if (invalidationTracker != null) {
invalidationTracker.untrackHashInvalidation(key);
}
}
} catch (MessageCodecException mce) {
throw new AssertionError("Codec error", mce);
}
}

Expand Down
12 changes: 12 additions & 0 deletions ...-entity/src/test/java/org/ehcache/clustered/server/store/ClusterTierActiveEntityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,18 @@ public void testLoadExistingRecoversInflightInvalidationsForEventualCache() thro
verify(clientCommunicator, times(10)).sendNoResponse(ArgumentMatchers.eq(client), ArgumentMatchers.isA(EhcacheEntityResponse.ClientInvalidateHash.class));
}

@Test
public void testInvalidationHandlingOnReconnectWindowTimeoutClosure() throws Exception {
ClusterTierActiveEntity activeEntity = new ClusterTierActiveEntity(defaultRegistry, defaultConfiguration, DEFAULT_MAPPER, SYNC_GETS_EXECUTOR);
EhcacheStateServiceImpl ehcacheStateService = defaultRegistry.getStoreManagerService();
ehcacheStateService.createStore(defaultStoreName, defaultStoreConfiguration, false); //Passive would have done this before failover

InvalidationTracker invalidationTracker = ehcacheStateService.getInvalidationTracker(defaultStoreName);
invalidationTracker.trackHashInvalidation(1L);

activeEntity.startReconnect().close();
}

@Test
@SuppressWarnings("unchecked")
public void testReplicationMessageAndOriginalServerStoreOpMessageHasSameConcurrency() throws Exception {
Expand Down
Loading