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: enforce bounds on query-related CLI/config parameters to avoid startup panics #20149

Merged
merged 5 commits into from
Nov 24, 2020

Conversation

danxmoran
Copy link
Contributor

Closes #20144

math.MaxInt32 is the biggest value that the WaitGroup wrapped in the query controller will accept without panicking. When I try running influxd with that parameter it takes a loooooong time to boot up, but I assume it'd be faster on a beefed-up VM.

@danxmoran danxmoran force-pushed the dm-query-concurrency-max-20144 branch 2 times, most recently from ead83ba to 10db735 Compare November 23, 2020 21:50
davidby-influx
davidby-influx previously approved these changes Nov 23, 2020
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.

You can proceed without my issues if you think they are not useful. Won't block the commit for these minor nits.

query/control/controller.go Outdated Show resolved Hide resolved
query/control/controller_test.go Outdated Show resolved Hide resolved
@@ -34,7 +36,6 @@ want to use the default.
1. [20053](https://github.com/influxdata/influxdb/pull/20053): Upgrade Flux to v0.95.0.
1. [20058](https://github.com/influxdata/influxdb/pull/20058): UI: Upgrade flux-lsp-browser to v0.5.23.
1. [20067](https://github.com/influxdata/influxdb/pull/20067): Add DBRP cli commands as `influxd v1 dbrp`.
1. [20097](https://github.com/influxdata/influxdb/pull/20097): Ensure Index.Walk fetches matching foreign keys only.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Accidentally filed under the wrong release

@danxmoran danxmoran dismissed davidby-influx’s stale review November 24, 2020 15:36

Extensive changes, worth another look

@danxmoran danxmoran force-pushed the dm-query-concurrency-max-20144 branch from 744d01d to ba10539 Compare November 24, 2020 15:37
@danxmoran danxmoran changed the title fix: enforce a max concurrency quota to avoid panic fix: enforce bounds on query-related CLI/config parameters to avoid startup panics Nov 24, 2020
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.

Looks much safer. Comments are outstanding!

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.

Panic when setting --query-concurrency to large value
2 participants