Skip to content

Cherry-pick #15738 to 7.x: Fix mapping and race condition in sql module#15748

Merged
jsoriano merged 1 commit intoelastic:7.xfrom
jsoriano:backport_15738_7.x
Jan 22, 2020
Merged

Cherry-pick #15738 to 7.x: Fix mapping and race condition in sql module#15748
jsoriano merged 1 commit intoelastic:7.xfrom
jsoriano:backport_15738_7.x

Conversation

@jsoriano
Copy link
Copy Markdown
Member

Cherry-pick of PR #15738 to 7.x branch. Original message:

Mapping was defined at the metricset level, but it should be defined at
the module level.

Add system test to earlier detect this kind of issues.

Also add validation so driver and sql_query options cannot be empty.

Fetch was reusing some maps when building the event, what was
causing mixed data in events and panics on queries with lots of rows.

Fixes #15736

Mapping was defined at the metricset level, but it should be defined at
the module level.

Add system test to earlier detect this kind of issues.

Also add validation so driver and sql_query options cannot be empty.

Fetch was reusing some maps when building the event, what was
causing mixed data in events and panics on queries with lots of rows.

Fixes elastic#15736

(cherry picked from commit badb2cb)
@jsoriano jsoriano requested a review from a team as a code owner January 22, 2020 15:54
Copy link
Copy Markdown
Contributor

@narph narph left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jsoriano
Copy link
Copy Markdown
Member Author

Failing test should be fixed by #15687

@jsoriano jsoriano merged commit a80882f into elastic:7.x Jan 22, 2020
@jsoriano jsoriano deleted the backport_15738_7.x branch January 22, 2020 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants