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.

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

fix(query): avoid breaking query config validation when upgrading from older versions #21325

Merged
merged 3 commits into from
Apr 29, 2021

Conversation

danxmoran
Copy link
Contributor

Closes #21319

Backports #21321 and #21324

  • Ensure query config written by influxd upgrade is valid.
  • Revert to nonzero defaults for query-concurrency and query-queue-size to avoid validation failures for upgrading users.
  • Don't fail validation when query-concurrency is 0 and query-queue-size is > 0.

danxmoran and others added 3 commits April 28, 2021 17:28
…id (#21321)

* test: refactor upgrade test to cover the config upgrade
* fix: ensure upgraded query config is valid
…21324)

* fix(query): accept queue-size > 0 when concurrency = 0
* fix(influxd): revert defaults for query settings to avoid validation err
* test: lower the default query concurrency used by test launchers
Copy link
Contributor

@davidby-influx davidby-influx left a comment

Choose a reason for hiding this comment

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

LGTM.

One non-blocking question.

@@ -205,11 +205,11 @@ func NewOpts(viper *viper.Viper) *InfluxdOpts {

NoTasks: false,

ConcurrencyQuota: 0,
ConcurrencyQuota: 1024,
Copy link
Contributor

Choose a reason for hiding this comment

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

Were you going to lower this because of the goproc limit?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think you saw in the original PR, but: the limits are lowered in the test launcher. See launcher_helpers.go

@danxmoran danxmoran merged commit 913bd73 into 2.0 Apr 29, 2021
@danxmoran danxmoran deleted the dm-backport-flux-query-config-fixes-21319 branch April 29, 2021 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants