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

Adjust translog after versionType is removed in 7.0 #32020

Merged
merged 4 commits into from
Jul 17, 2018
Merged

Adjust translog after versionType is removed in 7.0 #32020

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6826812
Adjust translog after versionType is removed in 7.0
dnhatn Jul 13, 2018
35d444d
Merge branch '6.x' into relax-version-type6
dnhatn Jul 16, 2018
53d99e4
backport formats from 7.0
dnhatn Jul 17, 2018
ca897b6
always read version_type
dnhatn Jul 17, 2018
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
12 changes: 10 additions & 2 deletions server/src/main/java/org/elasticsearch/index/translog/Translog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,11 @@ private Index(final StreamInput in) throws IOException {
in.readLong(); // timestamp
in.readLong(); // ttl
}
this.versionType = VersionType.fromValue(in.readByte());
if (format <= FORMAT_SEQ_NO) {
this.versionType = VersionType.fromValue(in.readByte());
} else {
this.versionType = VersionType.EXTERNAL; // versionType is removed in 7.0.0
}
assert versionType.validateVersionForWrites(this.version) : "invalid version for writes: " + this.version;
if (format >= FORMAT_AUTO_GENERATED_IDS) {
this.autoGeneratedIdTimestamp = in.readLong();
Expand Down Expand Up @@ -1250,7 +1254,11 @@ private Delete(final StreamInput in) throws IOException {
id = uidObject.id();
}
this.version = in.readLong();
this.versionType = VersionType.fromValue(in.readByte());
if (format <= FORMAT_SEQ_NO) {
this.versionType = VersionType.fromValue(in.readByte());
} else {
this.versionType = VersionType.EXTERNAL; // versionType is removed in 7.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it's worth while to back port the format identifier here .. at very least add a comment and assert that we will never use the format id of 7.0 here if we end up changing the format in the 6.x life time.

}
assert versionType.validateVersionForWrites(this.version);
if (format >= FORMAT_SEQ_NO) {
seqNo = in.readLong();
Expand Down
25 changes: 22 additions & 3 deletions server/src/main/java/org/elasticsearch/index/translog/TranslogWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import java.nio.file.StandardOpenOption;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.LongSupplier;

Expand Down Expand Up @@ -202,9 +203,27 @@ private synchronized boolean assertNoSeqNumberConflict(long seqNo, BytesReferenc
if (previous.v1().equals(data) == false) {
Translog.Operation newOp = Translog.readOperation(new BufferedChecksumStreamInput(data.streamInput()));
Translog.Operation prvOp = Translog.readOperation(new BufferedChecksumStreamInput(previous.v1().streamInput()));
throw new AssertionError(
"seqNo [" + seqNo + "] was processed twice in generation [" + generation + "], with different data. " +
"prvOp [" + prvOp + "], newOp [" + newOp + "]", previous.v2());
// we need to exclude versionType from this check because it's removed in 7.0
final boolean sameOp;
if (prvOp instanceof Translog.Index && newOp instanceof Translog.Index) {
final Translog.Index o1 = (Translog.Index) prvOp;
final Translog.Index o2 = (Translog.Index) newOp;
sameOp = Objects.equals(o1.id(), o2.id()) && Objects.equals(o1.type(), o2.type())
&& Objects.equals(o1.source(), o2.source()) && Objects.equals(o1.routing(), o2.routing())
&& o1.primaryTerm() == o2.primaryTerm() && o1.seqNo() == o2.seqNo() && o1.version() == o2.version();
} else if (prvOp instanceof Translog.Delete && newOp instanceof Translog.Delete) {
final Translog.Delete o1 = (Translog.Delete) prvOp;
final Translog.Delete o2 = (Translog.Delete) newOp;
sameOp = Objects.equals(o1.id(), o2.id()) && Objects.equals(o1.type(), o2.type())
&& o1.primaryTerm() == o2.primaryTerm() && o1.seqNo() == o2.seqNo() && o1.version() == o2.version();
} else {
sameOp = false;
}
if (sameOp == false) {
throw new AssertionError(
"seqNo [" + seqNo + "] was processed twice in generation [" + generation + "], with different data. " +
"prvOp [" + prvOp + "], newOp [" + newOp + "]", previous.v2());
}
}
} else {
seenSequenceNumbers.put(seqNo,
Expand Down