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-14428 size() and keySet() are not reliable and return fuzzy results #10560

Merged
merged 1 commit into from
Jan 11, 2023
Merged

[14.0.x] ISPN-14428 size() and keySet() are not reliable and return fuzzy results #10560

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
5 changes: 3 additions & 2 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 @@ -5,6 +5,7 @@
import java.lang.invoke.MethodHandles;
import java.net.SocketAddress;
import java.util.AbstractMap;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -55,15 +56,15 @@ public RemotePublisher(OperationsFactory operationsFactory, String filterConvert
if (segments == null) {
if (segmentConsistentHash != null) {
int maxSegment = segmentConsistentHash.getNumSegments();
this.segments = IntSets.mutableEmptySet(maxSegment);
this.segments = IntSets.concurrentSet(maxSegment);
for (int i = 0; i < maxSegment; ++i) {
this.segments.set(i);
}
} else {
this.segments = null;
}
} else {
this.segments = IntSets.mutableCopyFrom(segments);
this.segments = IntSets.concurrentCopyFrom(IntSets.from(segments), Collections.max(segments) + 1);
}
this.batchSize = batchSize;
this.metadata = metadata;
Expand Down
24 changes: 3 additions & 21 deletions ...d-client/src/main/java/org/infinispan/client/hotrod/impl/iteration/SegmentKeyTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import org.infinispan.client.hotrod.DataFormat;
import org.infinispan.client.hotrod.impl.consistenthash.SegmentConsistentHash;
import org.infinispan.client.hotrod.impl.protocol.HotRodConstants;
import org.infinispan.client.hotrod.logging.Log;
import org.infinispan.client.hotrod.logging.LogFactory;
import org.infinispan.commons.configuration.ClassAllowList;
Expand All @@ -27,8 +26,6 @@ class SegmentKeyTracker implements KeyTracker {
private final AtomicReferenceArray<Set<WrappedByteArray>> keysPerSegment;
private final SegmentConsistentHash segmentConsistentHash;
private final DataFormat dataFormat;
private volatile boolean trackSegments = true;
private Set<WrappedByteArray> keyOnlyTracker = new HashSet<>();

public SegmentKeyTracker(DataFormat dataFormat, SegmentConsistentHash segmentConsistentHash, Set<Integer> segments) {
this.dataFormat = dataFormat;
Expand All @@ -42,34 +39,19 @@ public SegmentKeyTracker(DataFormat dataFormat, SegmentConsistentHash segmentCon
segmentStream.forEach(i -> keysPerSegment.set(i, new HashSet<>()));
}

private void drainKeys() {
for (int i = 0; i < keysPerSegment.length(); i++) {
Set<WrappedByteArray> keys = keysPerSegment.get(i);
if (keys != null) keyOnlyTracker.addAll(keys);
keysPerSegment.set(i, null);
}
}

public boolean track(byte[] key, short status, ClassAllowList allowList) {
if (!trackSegments) return keyOnlyTracker.add(new WrappedByteArray(key));

int segment = HotRodConstants.isObjectStorage(status) ?
int segment = dataFormat.isObjectStorage() ?
segmentConsistentHash.getSegment(dataFormat.keyToObj(key, allowList)) :
segmentConsistentHash.getSegment(key);
Set<WrappedByteArray> keys = keysPerSegment.get(segment);
if (keys == null) {
trackSegments = false;
this.drainKeys();
return keyOnlyTracker.add(new WrappedByteArray(key));
}
if (keys == null) throw new IllegalStateException("Segment " + segment + " already completed");
boolean result = keys.add(new WrappedByteArray(key));
if (log.isTraceEnabled())
log.trackingSegmentKey(Util.printArray(key), segment, !result);
return result;
}

public Set<Integer> missedSegments() {
if (!trackSegments) return null;
int length = keysPerSegment.length();
if (length == 0) return null;
Set<Integer> missed = new HashSet<>(length);
Expand All @@ -82,7 +64,7 @@ public Set<Integer> missedSegments() {
}

public void segmentsFinished(IntSet finishedSegments) {
if (trackSegments && finishedSegments != null) {
if (finishedSegments != null) {
if (log.isTraceEnabled())
log.tracef("Removing completed segments %s", finishedSegments);
finishedSegments.forEach((IntConsumer) seg -> keysPerSegment.set(seg, null));
Expand Down
46 changes: 46 additions & 0 deletions ...ient/src/test/java/org/infinispan/client/hotrod/impl/iteration/SegmentKeyTrackerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package org.infinispan.client.hotrod.impl.iteration;

import static org.infinispan.client.hotrod.impl.protocol.HotRodConstants.NO_ERROR_STATUS;
import static org.testng.AssertJUnit.assertTrue;

import java.net.SocketAddress;
import java.util.Set;

import org.infinispan.client.hotrod.DataFormat;
import org.infinispan.client.hotrod.impl.consistenthash.SegmentConsistentHash;
import org.infinispan.commons.configuration.ClassAllowList;
import org.infinispan.commons.dataconversion.MediaType;
import org.infinispan.commons.marshall.IdentityMarshaller;
import org.infinispan.commons.test.Exceptions;
import org.infinispan.commons.util.IntSet;
import org.infinispan.commons.util.IntSets;
import org.testng.annotations.Test;

@Test(groups = "functional", testName = "client.hotrod.SegmentKeyTrackerTest")
public class SegmentKeyTrackerTest {

public void testNoDuplication() {
SocketAddress[][] segmentOwners = new SocketAddress[0][0];
SegmentConsistentHash ch = new SegmentConsistentHash();
ch.init(segmentOwners, 2);
DataFormat df = DataFormat.builder()
.keyType(MediaType.APPLICATION_OBJECT)
.keyMarshaller(IdentityMarshaller.INSTANCE)
.build();

KeyTracker tracker = new SegmentKeyTracker(df, ch, Set.of(0, 1));

// Belongs to segment 0
byte[] key = new byte[] { 0b0, 0b1 };
IntSet completed = IntSets.from(Set.of(0));

assertTrue(tracker.track(key, NO_ERROR_STATUS, new ClassAllowList()));
tracker.segmentsFinished(completed);
Exceptions.expectException(IllegalStateException.class, () ->
tracker.track(key, NO_ERROR_STATUS, new ClassAllowList()));

// Belongs to another segment.
byte[] anotherKey = new byte[] { 0b1, 0b0, 0b1 };
assertTrue(tracker.track(anotherKey, NO_ERROR_STATUS, new ClassAllowList()));
}
}
5 changes: 3 additions & 2 deletions client/hotrod/src/main/java/org/infinispan/hotrod/impl/iteration/RemotePublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.lang.invoke.MethodHandles;
import java.net.SocketAddress;
import java.util.AbstractMap;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -57,15 +58,15 @@ public RemotePublisher(CacheOperationsFactory cacheOperationsFactory, String fil
if (segments == null) {
if (segmentConsistentHash != null) {
int maxSegment = segmentConsistentHash.getNumSegments();
this.segments = IntSets.mutableEmptySet(maxSegment);
this.segments = IntSets.concurrentSet(maxSegment);
for (int i = 0; i < maxSegment; ++i) {
this.segments.set(i);
}
} else {
this.segments = null;
}
} else {
this.segments = IntSets.mutableCopyFrom(segments);
this.segments = IntSets.concurrentCopyFrom(IntSets.from(segments), Collections.max(segments) + 1);
}
this.batchSize = batchSize;
this.metadata = metadata;
Expand Down
24 changes: 3 additions & 21 deletions client/hotrod/src/main/java/org/infinispan/hotrod/impl/iteration/SegmentKeyTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import org.infinispan.hotrod.impl.consistenthash.SegmentConsistentHash;
import org.infinispan.hotrod.impl.logging.Log;
import org.infinispan.hotrod.impl.logging.LogFactory;
import org.infinispan.hotrod.impl.protocol.HotRodConstants;

/**
* @since 14.0
Expand All @@ -26,8 +25,6 @@ class SegmentKeyTracker implements KeyTracker {
private final AtomicReferenceArray<Set<WrappedByteArray>> keysPerSegment;
private final SegmentConsistentHash segmentConsistentHash;
private final DataFormat dataFormat;
private volatile boolean trackSegments = true;
private Set<WrappedByteArray> keyOnlyTracker = new HashSet<>();

public SegmentKeyTracker(DataFormat dataFormat, SegmentConsistentHash segmentConsistentHash, Set<Integer> segments) {
this.dataFormat = dataFormat;
Expand All @@ -41,34 +38,19 @@ public SegmentKeyTracker(DataFormat dataFormat, SegmentConsistentHash segmentCon
segmentStream.forEach(i -> keysPerSegment.set(i, new HashSet<>()));
}

private void drainKeys() {
for (int i = 0; i < keysPerSegment.length(); i++) {
Set<WrappedByteArray> keys = keysPerSegment.get(i);
if (keys != null) keyOnlyTracker.addAll(keys);
keysPerSegment.set(i, null);
}
}

public boolean track(byte[] key, short status, ClassAllowList allowList) {
if (!trackSegments) return keyOnlyTracker.add(new WrappedByteArray(key));

int segment = HotRodConstants.isObjectStorage(status) ?
int segment = dataFormat.isObjectStorage() ?
segmentConsistentHash.getSegment(dataFormat.keyToObj(key, allowList)) :
segmentConsistentHash.getSegment(key);
Set<WrappedByteArray> keys = keysPerSegment.get(segment);
if (keys == null) {
trackSegments = false;
this.drainKeys();
return keyOnlyTracker.add(new WrappedByteArray(key));
}
if (keys == null) throw new IllegalStateException("Segment " + segment + " already completed");
boolean result = keys.add(new WrappedByteArray(key));
if (log.isTraceEnabled())
log.trackingSegmentKey(Util.printArray(key), segment, !result);
return result;
}

public Set<Integer> missedSegments() {
if (!trackSegments) return null;
int length = keysPerSegment.length();
if (length == 0) return null;
Set<Integer> missed = new HashSet<>(length);
Expand All @@ -81,7 +63,7 @@ public Set<Integer> missedSegments() {
}

public void segmentsFinished(IntSet finishedSegments) {
if (trackSegments && finishedSegments != null) {
if (finishedSegments != null) {
if (log.isTraceEnabled())
log.tracef("Removing completed segments %s", finishedSegments);
finishedSegments.forEach((IntConsumer) seg -> keysPerSegment.set(seg, null));
Expand Down
2 changes: 1 addition & 1 deletion commons/all/src/main/java/org/infinispan/commons/util/ConcurrentSmallIntSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private void valueNonZero(int value) {

private void checkBounds(int index) {
if (index >= array.length()) {
throw new IllegalArgumentException("Provided integer was larger than originally initialized size");
throw new IllegalArgumentException("Provided integer " + index + " was larger than originally initialized size " + array.length());
}
}

Expand Down