Fix problems in GeoIPv2 code #71598
Merged
Fix problems in GeoIPv2 code #71598
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
probakowski
added
>non-issue
:Data Management/Ingest Node
elasticmachine
added
the
Team:Data Management
|
Pinging @elastic/es-core-features (Team:Core/Features) |
|
@elasticmachine update branch |
martijnvg
approved these changes
Apr 13, 2021
| @@ -219,6 +219,9 @@ private static XContentBuilder mappings() { | |||
| .startObject("chunk") | |||
| .field("type", "integer") | |||
| .endObject() | |||
| .startObject("timestamp") | |||
| .field("type", "long") | |||
There was a problem hiding this comment.
maybe use type date? This still accepts time in ms since epoch and treats values as date.
There was a problem hiding this comment.
as timestamp is part of the id now it doesn't need to be indexed separately. I've removed it from mapping
| MessageDigest md = MessageDigests.md5(); | ||
| for (byte[] buf = getChunk(is); buf.length != 0; buf = getChunk(is)) { | ||
| md.update(buf); | ||
| client.prepareIndex(DATABASES_INDEX).setId(name + "_" + chunk) |
There was a problem hiding this comment.
Maybe keep the _id but with timestamp? That way the _id has meaning and if due to some issue we index a document with the same _id then we fail with an error (b/c create=true).
There was a problem hiding this comment.
I switched back to using _id with added timestamp as you suggested
probakowski
added a commit
to probakowski/elasticsearch
that referenced
this pull request
Apr 13, 2021
This change fixes number of problems in GeoIPv2 code: - closes streams from Files.list in GeoIpCli, which should fix tests on Windows - makes sure that total download time in GeoIP stats is non-negative (we serialize it as vInt which can cause problems with negative numbers and it can happen when clock was changed during operation) - fixes handling of failed/simultaneous downloads, elastic#69951 was meant as a way to prevent 2 persistent tasks to index chunks but it would prevent any update if single download failed mid indexing, this change uses timestamp (lastUpdate) as sort of UUID. This should still prevent 2 tasks to step on each other toes (overwriting chunks) but in the end still only single task should be able to update task state (this is handled by persistent tasks framework) Closes elastic#71145 # Conflicts: # modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java
probakowski
added a commit
that referenced
this pull request
Apr 13, 2021
* Fix problems in GeoIPv2 code (#71598) This change fixes number of problems in GeoIPv2 code: - closes streams from Files.list in GeoIpCli, which should fix tests on Windows - makes sure that total download time in GeoIP stats is non-negative (we serialize it as vInt which can cause problems with negative numbers and it can happen when clock was changed during operation) - fixes handling of failed/simultaneous downloads, #69951 was meant as a way to prevent 2 persistent tasks to index chunks but it would prevent any update if single download failed mid indexing, this change uses timestamp (lastUpdate) as sort of UUID. This should still prevent 2 tasks to step on each other toes (overwriting chunks) but in the end still only single task should be able to update task state (this is handled by persistent tasks framework) Closes #71145 # Conflicts: # modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpDownloader.java * fix compilation
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.
This change fixes number of problems in GeoIPv2 code:
Files.listinGeoIpCli, which should fix tests on WindowsvIntwhich can cause problems with negative numbers and it can happen when clock was changed during operation)lastUpdate) as sort of UUID. This should still prevent 2 tasks to step on each other toes (overwriting chunks) but in the end still only single task should be able to update task state (this is handled by persistent tasks framework)Closes #71145