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

[14.0.x] ISPN-15239 HotRod client repeatedly retries iteration operation again… #11427

Merged
merged 1 commit into from
Oct 25, 2023
Merged

[14.0.x] ISPN-15239 HotRod client repeatedly retries iteration operation again… #11427

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion ...rc/main/java/org/infinispan/client/hotrod/impl/iteration/RemoteInnerPublisherHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.infinispan.client.hotrod.impl.iteration;

import java.lang.invoke.MethodHandles;
import java.net.ConnectException;
import java.net.SocketAddress;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -112,7 +113,7 @@ protected long handleNextResponse(IterationNextResponse<K, E> nextResponse, Map.

@Override
protected void handleThrowableInResponse(Throwable t, Map.Entry<SocketAddress, IntSet> target) {
if (t instanceof TransportException || t instanceof RemoteIllegalLifecycleStateException) {
if (t instanceof TransportException || t instanceof RemoteIllegalLifecycleStateException || t instanceof ConnectException) {
log.throwableDuringPublisher(t);
if (log.isTraceEnabled()) {
IntSet targetSegments = target.getValue();
Expand Down
1 change: 1 addition & 0 deletions ...rod-client/src/main/java/org/infinispan/client/hotrod/impl/iteration/RemotePublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ protected void handleThrowableInResponse(Throwable t, Map.Entry<SocketAddress, I
int batchSize = (this.batchSize / actualTargets.size()) + 1;
return Flowable.fromIterable(actualTargets.entrySet())
.map(entry -> {
log.tracef("Requesting next for: %s", entry);
RemoteInnerPublisherHandler<K, E> innerHandler = new RemoteInnerPublisherHandler<>(this,
batchSize, () -> null, entry);
return innerHandler.startPublisher();
Expand Down
20 changes: 20 additions & 0 deletions .../src/test/java/org/infinispan/client/hotrod/impl/iteration/BaseIterationFailOverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import static org.testng.AssertJUnit.assertEquals;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
Expand All @@ -14,6 +15,7 @@
import org.infinispan.client.hotrod.test.HotRodClientTestingUtil;
import org.infinispan.client.hotrod.test.MultiHotRodServersTest;
import org.infinispan.commons.util.CloseableIterator;
import org.infinispan.commons.util.CloseableIteratorSet;
import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.protostream.SerializationContextInitializer;
import org.infinispan.query.dsl.embedded.DslSCI;
Expand Down Expand Up @@ -74,6 +76,24 @@ public void testFailOver() throws InterruptedException {
assertEquals(rangeAsSet(0, cacheSize), keys);
}

@Test(groups = "functional")
public void testServerLeaveButIterateTwice() throws InterruptedException {
testFailOver();
int cacheSize = 1_000;

RemoteCache<Integer, AccountHS> cache = clients.get(0).getCache();
Collection<Map.Entry<Object, Object>> entries = new ArrayList<>();
CloseableIteratorSet<Map.Entry<Integer, AccountHS>> iterator = cache.entrySet();
for (Map.Entry<Integer, AccountHS> entry : iterator) {
entries.add((Map.Entry) entry);
}

assertEquals(cacheSize, entries.size());

Set<Integer> keys = extractKeys(entries);
assertEquals(rangeAsSet(0, cacheSize), keys);
}

protected void killAnIterationServer() {
servers.stream()
.filter(s -> s.getIterationManager().activeIterations() > 0)
Expand Down
3 changes: 2 additions & 1 deletion ...otrod/src/main/java/org/infinispan/hotrod/impl/iteration/RemoteInnerPublisherHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.infinispan.hotrod.impl.iteration;

import java.lang.invoke.MethodHandles;
import java.net.ConnectException;
import java.net.SocketAddress;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -113,7 +114,7 @@ protected long handleNextResponse(IterationNextResponse<K, E> nextResponse, Map.

@Override
protected void handleThrowableInResponse(Throwable t, Map.Entry<SocketAddress, IntSet> target) {
if (t instanceof TransportException || t instanceof RemoteIllegalLifecycleStateException) {
if (t instanceof TransportException || t instanceof RemoteIllegalLifecycleStateException || t instanceof ConnectException) {
log.throwableDuringPublisher(t);
if (log.isTraceEnabled()) {
IntSet targetSegments = target.getValue();
Expand Down