honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combine overriddenOps and skippedOps in translog (#39771)

Browse Source 
These two stats are not important enough to be distinguishable.
This change combines them into a single stat.

Closes #33317
This commit is contained in:
Nhat Nguyen 2019-03-07 12:07:38 -05:00
parent 671a209ed9
commit 993182e426
4 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java
View File

@ -58,16 +58,7 @@ final class MultiSnapshot implements Translog.Snapshot {
@Override
public int skippedOperations() {
int skippedOperations = overriddenOperations;
for (TranslogSnapshot translog : translogs) {
skippedOperations += translog.skippedOperations();
}
return skippedOperations;
}
@Override
public int overriddenOperations() {
return overriddenOperations;
return Arrays.stream(translogs).mapToInt(TranslogSnapshot::skippedOperations).sum() + overriddenOperations;
}
@Override

15
server/src/main/java/org/elasticsearch/index/translog/Translog.java
View File

@ -936,20 +936,12 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC
/**
* The number of operations have been skipped (overridden or trimmed) in the snapshot so far.
* Unlike {@link #totalOperations()}, this value is updated each time after {@link #next()}) is called.
*/
default int skippedOperations() {
return 0;
}
/**
* The number of operations have been overridden (eg. superseded) in the snapshot so far.
* If two operations have the same sequence number, the operation with a lower term will be overridden by the operation
* with a higher term. Unlike {@link #totalOperations()}, this value is updated each time after {@link #next()}) is called.
*/
default int overriddenOperations() {
return 0;
}
/**
* Returns the next operation in the snapshot or <code>null</code> if we reached the end.
*/
@ -985,11 +977,6 @@ public class Translog extends AbstractIndexShardComponent implements IndexShardC
return filteredOpsCount + delegate.skippedOperations();
}
@Override
public int overriddenOperations() {
return delegate.overriddenOperations();
}
@Override
public Operation next() throws IOException {
Translog.Operation op;

1
server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java
View File

@ -584,7 +584,6 @@ public class IndexLevelReplicationTests extends ESIndexLevelReplicationTestCase
assertThat(op2.seqNo(), equalTo(op1.seqNo()));
assertThat(op2.primaryTerm(), greaterThan(op1.primaryTerm()));
assertThat("Remaining of snapshot should contain init operations", snapshot, containsOperationsInAnyOrder(initOperations));
assertThat(snapshot.overriddenOperations(), equalTo(0));
assertThat(snapshot.skippedOperations(), equalTo(1));
}

2
server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
View File

@ -715,7 +715,6 @@ public class TranslogTests extends ESTestCase {
Translog.Snapshot filter = new Translog.SeqNoFilterSnapshot(snapshot, between(200, 300), between(300, 400)); // out range
assertThat(filter, SnapshotMatchers.size(0));
assertThat(filter.totalOperations(), equalTo(snapshot.totalOperations()));
assertThat(filter.overriddenOperations(), equalTo(snapshot.overriddenOperations()));
assertThat(filter.skippedOperations(), equalTo(snapshot.totalOperations()));
}
try (Translog.Snapshot snapshot = translog.newSnapshot()) {
@ -726,7 +725,6 @@ public class TranslogTests extends ESTestCase {
Translog.Snapshot filter = new Translog.SeqNoFilterSnapshot(snapshot, fromSeqNo, toSeqNo);
assertThat(filter, SnapshotMatchers.containsOperationsInAnyOrder(selectedOps));
assertThat(filter.totalOperations(), equalTo(snapshot.totalOperations()));
assertThat(filter.overriddenOperations(), equalTo(snapshot.overriddenOperations()));
assertThat(filter.skippedOperations(), equalTo(snapshot.skippedOperations() + operations.size() - selectedOps.size()));
}
}