Skip to content

[7.x] [Reporting CSV] Fix scroll ID bug for deprecated csv export (#106892) #107295

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

Merged
tsullivan merged 1 commit into from
Jul 30, 2021
Merged

[7.x] [Reporting CSV] Fix scroll ID bug for deprecated csv export (#106892) #107295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions x-pack/plugins/reporting/server/export_types/csv/execute_job.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ describe('CSV Execute Job', function () {
);

expect(mockEsClient.scroll).toHaveBeenCalledWith(
expect.objectContaining({ scroll_id: scrollId })
expect.objectContaining({ body: { scroll_id: scrollId } })
);
});

Expand Down Expand Up @@ -261,7 +261,7 @@ describe('CSV Execute Job', function () {
);

expect(mockEsClient.clearScroll).toHaveBeenCalledWith(
expect.objectContaining({ scroll_id: lastScrollId })
expect.objectContaining({ body: { scroll_id: lastScrollId } })
);
});

Expand Down Expand Up @@ -295,7 +295,7 @@ describe('CSV Execute Job', function () {
);

expect(mockEsClient.clearScroll).toHaveBeenCalledWith(
expect.objectContaining({ scroll_id: lastScrollId })
expect.objectContaining({ body: { scroll_id: lastScrollId } })
);
});
});
Expand Down Expand Up @@ -753,7 +753,7 @@ describe('CSV Execute Job', function () {

expect(mockEsClient.clearScroll).toHaveBeenCalledWith(
expect.objectContaining({
scroll_id: scrollId,
body: { scroll_id: scrollId },
})
);
});
Expand Down Expand Up @@ -1150,7 +1150,7 @@ describe('CSV Execute Job', function () {
await runTask('job123', jobParams, cancellationToken);

expect(mockEsClient.scroll).toHaveBeenCalledWith(
expect.objectContaining({ scroll: scrollDuration })
expect.objectContaining({ body: { scroll: scrollDuration, scroll_id: 'scrollId' } })
);
});
});
Expand Down
10 changes: 6 additions & 4 deletions x-pack/plugins/reporting/server/export_types/csv/generate_csv/hit_iterator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@ export function createHitIterator(logger: LevelLogger) {
);
}

async function scroll(scrollId: string | undefined) {
async function scroll(scrollId: string) {
logger.debug('executing scroll request');
return parseResponse(
await elasticsearchClient.scroll({
scroll_id: scrollId,
scroll: scrollSettings.duration,
body: {
scroll_id: scrollId,
scroll: scrollSettings.duration,
},
})
);
}
Expand All @@ -74,7 +76,7 @@ export function createHitIterator(logger: LevelLogger) {
logger.debug('executing clearScroll request');
try {
await elasticsearchClient.clearScroll({
scroll_id: scrollId,
body: { scroll_id: scrollId },
});
} catch (err) {
// Do not throw the error, as the job can still be completed successfully
Expand Down