[Maps] [File upload] Fix maps geojson upload hanging on index step#42623
Merged
kindsun merged 6 commits intoelastic:masterfrom Aug 8, 2019
Merged
[Maps] [File upload] Fix maps geojson upload hanging on index step#42623kindsun merged 6 commits intoelastic:masterfrom
kindsun merged 6 commits intoelastic:masterfrom
Conversation
kindsun
added
release_note:fix
Team:Geo
Contributor
|
Pinging @elastic/kibana-gis |
Contributor
💔 Build Failed |
Contributor
Author
|
retest |
Contributor
💚 Build Succeeded |
x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
Outdated
Show resolved
Hide resolved
Contributor
|
A good test for this one woudl be the file linked here: https://discuss.elastic.co/t/custom-vector-maps-with-accents/194075/3 It's a small-ish file, with smallish number of features (a few thousand), but large-ish geometries. Can you upload this file now after this PR? |
added 2 commits
August 8, 2019 08:38
Contributor
Author
Nice dataset. Uploaded without issue!
|
Contributor
💚 Build Succeeded |
thomasneirynck
approved these changes
Aug 8, 2019
Contributor
thomasneirynck
left a comment
thomasneirynck
left a comment
There was a problem hiding this comment.
See comment to clean up redundant branching and trim some LOC/tmp vars.
Geojson is getting real nice with all the recent bug fixes. We're getting to upload some real-world datasets without a hitch. 👏
Contributor
💚 Build Succeeded |
kindsun
pushed a commit
to kindsun/kibana
that referenced
this pull request
Aug 8, 2019
…lastic#42623) * Remove timeout from fetch. Falls back to 30 second timeout on server-side indexing call * Handle when indexing request is a success but every doc failed * Return failures array from catch * Review feedback * Review feedback
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Aug 9, 2019
…p-metrics-selectall * 'master' of github.com:elastic/kibana: (306 commits) [ML] Adding job overrides to the module setup endpoint (elastic#42946) [APM] Fix missing RUM url (elastic#42940) close socket timeouts without message (elastic#42456) Upgrade elastic/charts to 8.1.6 (elastic#42518) [ML] Delete old AngularJS data visualizer and refactor folders (elastic#42962) Add custom formatting for Date Nanos Format (elastic#42445) [Vega] Shim new platform - vega_fn.js -> vega_fn.js , use ExpressionFunction (elastic#42582) add socket.getPeerCertificate to KibanaRequest (elastic#42929) [Automation] ISTANBUL PRESET PATH is not working fine with constructor(private foo) (elastic#42683) [ML] Data frames: Updated stats structure. (elastic#42923) [Code] fixed the issue that the repository can not be deleted in some cases. (elastic#42841) [kbn-es] Support for passing regex value to ES (elastic#42651) Connect to Elasticsearch via SSL when starting kibana with `--ssl` (elastic#42840) Add Elasticsearch SSL support for integration tests (elastic#41765) Fix duplicate fetch in Visualize (elastic#41204) [DOCS] TSVB and Timelion clean up (elastic#42953) [Maps] [File upload] Fix maps geojson upload hanging on index step (elastic#42623) [APM] Use rounded bucket sizes for transaction distribution (elastic#42830) [yarn.lock] consistent resolve domain (elastic#42969) [Uptime] [Test] Repurpose unit test assertions to avoid flakiness (elastic#40650) ...
kindsun
pushed a commit
to kindsun/kibana
that referenced
this pull request
Aug 9, 2019
…lastic#42623) * Remove timeout from fetch. Falls back to 30 second timeout on server-side indexing call * Handle when indexing request is a success but every doc failed * Return failures array from catch * Review feedback * Review feedback # Conflicts: # x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
kindsun
pushed a commit
that referenced
this pull request
Aug 9, 2019
…tep (#42623) (#43033) * [Maps] [File upload] Fix maps geojson upload hanging on index step (#42623) * Remove timeout from fetch. Falls back to 30 second timeout on server-side indexing call * Handle when indexing request is a success but every doc failed * Return failures array from catch * Review feedback * Review feedback # Conflicts: # x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js * Indentation
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Resolves #40102. Indexing would hang when requests exceeded the allotted timeout of 10 seconds, at which point
fetchWithTimeoutwould returnnull, causing downstream issues. This PR makes a couple of changes:callWithRequestwhich times out after 30 secondsAttached are two files used for test. The indexing of the larger of the two files,
addresses.geo.jsonexceeded the previous timeout of 10 seconds on account of using a reserved field_idin all docs. Previously this behavior resulted in the issue described, now it times out on the server side and the message is sent back to the client. The smaller fileshort_addresses.geo.jsondoesn't exceed any timeouts but is returned a success with all docs failed. This is correctly handled as a non-addable layer.long_and_short_addresses_test_files.tar.gz