Don't persist type information to translog #47229
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
romseygeek
added
:Distributed Indexing/Engine
|
Pinging @elastic/es-distributed |
dnhatn
reviewed
Sep 27, 2019
There was a problem hiding this comment.
Looks great. Thanks, @romseygeek.
I left two comments relating to BWC in translog. I will need some time to look carefully at other files.
server/src/main/java/org/elasticsearch/index/translog/Translog.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/index/translog/Translog.java
Outdated
Show resolved
Hide resolved
dnhatn
approved these changes
Oct 14, 2019
There was a problem hiding this comment.
LGTM. Thanks, @romseygeek for your huge effort. I left two smaller comments.
| @@ -155,7 +155,7 @@ public void testResyncDoesNotBlockOnPrimaryAction() throws Exception { | |||
|
|
|||
| final byte[] bytes = "{}".getBytes(Charset.forName("UTF-8")); | |||
| final ResyncReplicationRequest request = new ResyncReplicationRequest(shardId, 42L, 100, | |||
| new Translog.Operation[]{new Translog.Index("type", "id", 0, primaryTerm, 0L, bytes, null, -1)}); | |||
| new Translog.Operation[]{new Translog.Index("type", 0, primaryTerm, 0L, bytes, null, -1)}); | |||
There was a problem hiding this comment.
We should keep "id" instead of "type" here.
| @@ -83,7 +83,7 @@ private void applyOperation(Engine engine, Engine.Operation operation) throws IO | |||
| Engine.Index engineIndex = (Engine.Index) operation; | |||
| Mapping update = engineIndex.parsedDoc().dynamicMappingsUpdate(); | |||
| if (engineIndex.parsedDoc().dynamicMappingsUpdate() != null) { | |||
| recoveredTypes.compute(engineIndex.type(), (k, mapping) -> mapping == null ? update : mapping.merge(update)); | |||
| recoveredTypes.compute("", (k, mapping) -> mapping == null ? update : mapping.merge(update)); | |||
There was a problem hiding this comment.
I think we should remove "recoveredTypes" and adjust the related tests.
|
Thanks @dnhatn, I pushed a change removing |
|
@elasticmachine update branch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We no longer need to store type information in the translog, given that an index
can only have a single type.
Relates to #41059