Skip to content

Backport fixes to enable feature flag#11970

Closed
andsel wants to merge 3 commits intoelastic:7.xfrom
andsel:backport_fixes_to_enable_feature_flag
Closed

Backport fixes to enable feature flag#11970
andsel wants to merge 3 commits intoelastic:7.xfrom
andsel:backport_fixes_to_enable_feature_flag

Conversation

@andsel
Copy link
Copy Markdown
Contributor

@andsel andsel commented Jun 4, 2020

andsel added 3 commits June 4, 2020 16:33
Some QA tests reads the FEATURE_FLAG environment variable, for example to test PQ functionality.
This PR passthrough the environement variable inside the Docker instance.
…LAG is enabled

Updated log4j definitions used when FEATURE_FLAG=persistent_queue is used.

Closes elastic#11924
…s for _node/stats

Avoid to reassing the subdocument for queue metrics preferring a merge
With PR elastic#10576 the PluginsStats.report(stats) overwrites the subsection related to queue instead of merge with newly created entries.
Copy link
Copy Markdown
Member

@robbavey robbavey left a comment

Choose a reason for hiding this comment

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

LGTM, but can we make sure these are separate commits in the codebase? They address different concerns, making functional changes to the code, changes to test fixtures, and correcting visibility of a flag in CI

@elasticsearch-bot
Copy link
Copy Markdown

Andrea Selva merged this into the following branches!

Branch Commits
7.x 326b1c1, f3f6ca0, 24d60b8

elasticsearch-bot pushed a commit that referenced this pull request Jun 5, 2020
Some QA tests reads the FEATURE_FLAG environment variable, for example to test PQ functionality.
This PR passthrough the environement variable inside the Docker instance.

Fixes #11970
elasticsearch-bot pushed a commit that referenced this pull request Jun 5, 2020
…LAG is enabled

Updated log4j definitions used when FEATURE_FLAG=persistent_queue is used.

Closes #11924

Fixes #11970
elasticsearch-bot pushed a commit that referenced this pull request Jun 5, 2020
…s for _node/stats

Avoid to reassing the subdocument for queue metrics preferring a merge
With PR #10576 the PluginsStats.report(stats) overwrites the subsection related to queue instead of merge with newly created entries.

Fixes #11970
@andsel andsel closed this Jun 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants