honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix limit on retaining sequence number (#37992) 

We only assign non-negative sequence numbers to operations, so the lower
limit on retaining sequence numbers should be that it is non-negative
only.
This commit is contained in:
Jason Tedor 2019-01-30 05:25:17 -05:00 committed by GitHub
parent 3865435a01
commit ba285a56a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/org/elasticsearch/index/seqno/RetentionLease.java
View File

@ -101,7 +101,7 @@ public final class RetentionLease implements Writeable {
// retention lease IDs can not contain these characters because they are used in encoding retention leases // retention lease IDs can not contain these characters because they are used in encoding retention leases
throw new IllegalArgumentException("retention lease ID can not contain any of [:;,] but was [" + id + "]"); throw new IllegalArgumentException("retention lease ID can not contain any of [:;,] but was [" + id + "]");
} }
if (retainingSequenceNumber < SequenceNumbers.UNASSIGNED_SEQ_NO) { if (retainingSequenceNumber < 0) {
throw new IllegalArgumentException("retention lease retaining sequence number [" + retainingSequenceNumber + "] out of range"); throw new IllegalArgumentException("retention lease retaining sequence number [" + retainingSequenceNumber + "] out of range");
} }
if (timestamp < 0) { if (timestamp < 0) {

2
server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
View File

@ -5313,7 +5313,7 @@ public class InternalEngineTests extends EngineTestCase {
final List<RetentionLease> leases = new ArrayList<>(length); final List<RetentionLease> leases = new ArrayList<>(length);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
final String id = randomAlphaOfLength(8); final String id = randomAlphaOfLength(8);
final long retainingSequenceNumber = randomLongBetween(0L, Math.max(0L, globalCheckpoint.get())); final long retainingSequenceNumber = randomLongBetween(0, Math.max(0, globalCheckpoint.get()));
final long timestamp = randomLongBetween(0L, Long.MAX_VALUE); final long timestamp = randomLongBetween(0L, Long.MAX_VALUE);
final String source = randomAlphaOfLength(8); final String source = randomAlphaOfLength(8);
leases.add(new RetentionLease(id, retainingSequenceNumber, timestamp, source)); leases.add(new RetentionLease(id, retainingSequenceNumber, timestamp, source));

2
server/src/test/java/org/elasticsearch/index/engine/SoftDeletesPolicyTests.java
View File

@ -49,7 +49,7 @@ public class SoftDeletesPolicyTests extends ESTestCase {
AtomicLong globalCheckpoint = new AtomicLong(SequenceNumbers.NO_OPS_PERFORMED); AtomicLong globalCheckpoint = new AtomicLong(SequenceNumbers.NO_OPS_PERFORMED);
final AtomicLong[] retainingSequenceNumbers = new AtomicLong[randomIntBetween(0, 8)]; final AtomicLong[] retainingSequenceNumbers = new AtomicLong[randomIntBetween(0, 8)];
for (int i = 0; i < retainingSequenceNumbers.length; i++) { for (int i = 0; i < retainingSequenceNumbers.length; i++) {
retainingSequenceNumbers[i] = new AtomicLong(SequenceNumbers.UNASSIGNED_SEQ_NO); retainingSequenceNumbers[i] = new AtomicLong();
} }
final Supplier<Collection<RetentionLease>> retentionLeasesSupplier = final Supplier<Collection<RetentionLease>> retentionLeasesSupplier =
() -> { () -> {

2
server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java
View File

@ -156,7 +156,7 @@ public class ReplicationTrackerRetentionLeaseTests extends ReplicationTrackerTes
replicationTracker.activatePrimaryMode(SequenceNumbers.NO_OPS_PERFORMED); replicationTracker.activatePrimaryMode(SequenceNumbers.NO_OPS_PERFORMED);
} }
final long[] retainingSequenceNumbers = new long[1]; final long[] retainingSequenceNumbers = new long[1];
retainingSequenceNumbers[0] = randomLongBetween(SequenceNumbers.NO_OPS_PERFORMED, Long.MAX_VALUE); retainingSequenceNumbers[0] = randomLongBetween(0, Long.MAX_VALUE);
if (primaryMode) { if (primaryMode) {
replicationTracker.addRetentionLease("0", retainingSequenceNumbers[0], "test-0", ActionListener.wrap(() -> {})); replicationTracker.addRetentionLease("0", retainingSequenceNumbers[0], "test-0", ActionListener.wrap(() -> {}));
} else { } else {

4
server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseSyncIT.java
View File

@ -67,7 +67,7 @@ public class RetentionLeaseSyncIT extends ESIntegTestCase {
final Map<String, RetentionLease> currentRetentionLeases = new HashMap<>(); final Map<String, RetentionLease> currentRetentionLeases = new HashMap<>();
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
final String id = randomValueOtherThanMany(currentRetentionLeases.keySet()::contains, () -> randomAlphaOfLength(8)); final String id = randomValueOtherThanMany(currentRetentionLeases.keySet()::contains, () -> randomAlphaOfLength(8));
final long retainingSequenceNumber = randomLongBetween(SequenceNumbers.NO_OPS_PERFORMED, Long.MAX_VALUE); final long retainingSequenceNumber = randomLongBetween(0, Long.MAX_VALUE);
final String source = randomAlphaOfLength(8); final String source = randomAlphaOfLength(8);
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
final ActionListener<ReplicationResponse> listener = ActionListener.wrap(r -> latch.countDown(), e -> fail(e.toString())); final ActionListener<ReplicationResponse> listener = ActionListener.wrap(r -> latch.countDown(), e -> fail(e.toString()));
@ -119,7 +119,7 @@ public class RetentionLeaseSyncIT extends ESIntegTestCase {
final int length = randomIntBetween(1, 8); final int length = randomIntBetween(1, 8);
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
final String id = randomAlphaOfLength(8); final String id = randomAlphaOfLength(8);
final long retainingSequenceNumber = randomLongBetween(SequenceNumbers.NO_OPS_PERFORMED, Long.MAX_VALUE); final long retainingSequenceNumber = randomLongBetween(0, Long.MAX_VALUE);
final String source = randomAlphaOfLength(8); final String source = randomAlphaOfLength(8);
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
final ActionListener<ReplicationResponse> listener = ActionListener.wrap(r -> latch.countDown(), e -> fail(e.toString())); final ActionListener<ReplicationResponse> listener = ActionListener.wrap(r -> latch.countDown(), e -> fail(e.toString()));

7
server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseTests.java
View File

@ -28,7 +28,6 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.empty;
@ -53,7 +52,7 @@ public class RetentionLeaseTests extends ESTestCase {
} }
public void testRetainingSequenceNumberOutOfRange() { public void testRetainingSequenceNumberOutOfRange() {
final long retainingSequenceNumber = randomLongBetween(Long.MIN_VALUE, UNASSIGNED_SEQ_NO - 1); final long retainingSequenceNumber = randomLongBetween(Long.MIN_VALUE, -1);
final IllegalArgumentException e = expectThrows( final IllegalArgumentException e = expectThrows(
IllegalArgumentException.class, IllegalArgumentException.class,
() -> new RetentionLease("id", retainingSequenceNumber, randomNonNegativeLong(), "source")); () -> new RetentionLease("id", retainingSequenceNumber, randomNonNegativeLong(), "source"));
@ -66,7 +65,7 @@ public class RetentionLeaseTests extends ESTestCase {
final long timestamp = randomLongBetween(Long.MIN_VALUE, -1); final long timestamp = randomLongBetween(Long.MIN_VALUE, -1);
final IllegalArgumentException e = expectThrows( final IllegalArgumentException e = expectThrows(
IllegalArgumentException.class, IllegalArgumentException.class,
() -> new RetentionLease("id", randomLongBetween(SequenceNumbers.NO_OPS_PERFORMED, Long.MAX_VALUE), timestamp, "source")); () -> new RetentionLease("id", randomNonNegativeLong(), timestamp, "source"));
assertThat(e, hasToString(containsString("retention lease timestamp [" + timestamp + "] out of range"))); assertThat(e, hasToString(containsString("retention lease timestamp [" + timestamp + "] out of range")));
} }
@ -87,7 +86,7 @@ public class RetentionLeaseTests extends ESTestCase {
public void testRetentionLeaseSerialization() throws IOException { public void testRetentionLeaseSerialization() throws IOException {
final String id = randomAlphaOfLength(8); final String id = randomAlphaOfLength(8);
final long retainingSequenceNumber = randomLongBetween(SequenceNumbers.NO_OPS_PERFORMED, Long.MAX_VALUE); final long retainingSequenceNumber = randomLongBetween(0, Long.MAX_VALUE);
final long timestamp = randomNonNegativeLong(); final long timestamp = randomNonNegativeLong();
final String source = randomAlphaOfLength(8); final String source = randomAlphaOfLength(8);
final RetentionLease retentionLease = new RetentionLease(id, retainingSequenceNumber, timestamp, source); final RetentionLease retentionLease = new RetentionLease(id, retainingSequenceNumber, timestamp, source);

2
server/src/test/java/org/elasticsearch/index/shard/IndexShardRetentionLeaseTests.java
View File

@ -113,7 +113,7 @@ public class IndexShardRetentionLeaseTests extends IndexShardTestCase {
final IndexShard indexShard = newStartedShard(primary, settings, new InternalEngineFactory()); final IndexShard indexShard = newStartedShard(primary, settings, new InternalEngineFactory());
try { try {
final long[] retainingSequenceNumbers = new long[1]; final long[] retainingSequenceNumbers = new long[1];
retainingSequenceNumbers[0] = randomLongBetween(SequenceNumbers.NO_OPS_PERFORMED, Long.MAX_VALUE); retainingSequenceNumbers[0] = randomLongBetween(0, Long.MAX_VALUE);
if (primary) { if (primary) {
indexShard.addRetentionLease("0", retainingSequenceNumbers[0], "test-0", ActionListener.wrap(() -> {})); indexShard.addRetentionLease("0", retainingSequenceNumbers[0], "test-0", ActionListener.wrap(() -> {}));
} else { } else {