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

[Maps] [File upload] Fix maps geojson upload hanging on index step #42623

Merged
merged 6 commits into from
Aug 8, 2019
Merged

[Maps] [File upload] Fix maps geojson upload hanging on index step #42623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d54314
Remove timeout from fetch. Falls back to 30 second timeout on server-…
Aug 5, 2019
fcdd702
Handle when indexing request is a success but every doc failed
Aug 5, 2019
435a9f0
Return failures array from catch
Aug 5, 2019
433269b
Merge remote-tracking branch 'upstream/master' into fix-hanging-on-in…
Aug 8, 2019
7a2e1f8
Review feedback
Aug 8, 2019
2b9b570
Review feedback
Aug 8, 2019
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
44 changes: 11 additions & 33 deletions x-pack/legacy/plugins/file_upload/public/util/http_service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@
* you may not use this file except in compliance with the Elastic License.
*/



// service for interacting with the server

import chrome from 'ui/chrome';
import { addSystemApiHeader } from 'ui/system_api';
import { i18n } from '@kbn/i18n';

const FETCH_TIMEOUT = 10000;

export async function http(options) {
if(!(options && options.url)) {
throw(
Expand All @@ -40,38 +36,20 @@ export async function http(options) {
if (body !== null) {
payload.body = body;
}
return await fetchWithTimeout(url, payload);
return await doFetch(url, payload);
}

async function fetchWithTimeout(url, payload) {
let timedOut = false;

return new Promise(function (resolve, reject) {
const timeout = setTimeout(function () {
timedOut = true;
reject(new Error(
i18n.translate('xpack.fileUpload.httpService.requestTimedOut',
{ defaultMessage: 'Request timed out' }))
);
}, FETCH_TIMEOUT);

fetch(url, payload)
.then(resp => {
clearTimeout(timeout);
if (!timedOut) {
resolve(resp);
}
})
.catch(function (err) {
reject(err);
if (timedOut) return;
});
}).then(resp => resp.json())
.catch(function (err) {
console.error(
async function doFetch(url, payload) {
kindsun marked this conversation as resolved.
Show resolved Hide resolved
try {
const resp = await fetch(url, payload);
return resp.json();
} catch(err) {
return {
failures: [
i18n.translate('xpack.fileUpload.httpService.fetchError', {
defaultMessage: 'Error performing fetch: {error}',
values: { error: err.message }
}));
});
})]
};
}
}
8 changes: 6 additions & 2 deletions x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@ export class GeojsonFileSource extends AbstractVectorSource {
) => {
return (indexResponses = {}) => {
const { indexDataResp, indexPatternResp } = indexResponses;
if (!(indexDataResp && indexDataResp.success) ||
!(indexPatternResp && indexPatternResp.success)) {

const indexCreationFailed = !(indexDataResp && indexDataResp.success);
const allDocsFailed = indexDataResp.failures.length === indexDataResp.docCount;
const indexPatternCreationFailed = !(indexPatternResp && indexPatternResp.success);

if (indexCreationFailed || allDocsFailed || indexPatternCreationFailed) {
importErrorHandler(indexResponses);
return;
}
Expand Down