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

slack-15.0: support v17+ --queryserver-config-* duration values #492

Merged
merged 9 commits into from
Aug 20, 2024

Conversation

timvaillancourt
Copy link
Member

@timvaillancourt timvaillancourt commented Aug 14, 2024

Description

This PR adds support for v19-style timeout values to make the rollout of v19 easier. Feature flagging this by Vitess version and chef at the same time is too complicated. TL;DR: v17+ expects real time durations, not a number

This change in flag style is explained in these v17 changelog notes

The new DurationOrSecondsFloatFlag stores a timeout value in the same float64 format but supports parsing string durations (the v19 behaviour) AND floats (the v15 behaviour)

Finally, vitessio#12813 was cherry-picked to resolve some CI flakiness preventing this PR from passing CI

Related Issue(s)

Potential CI flake fix: vitessio#12813

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

Deployment Notes

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
…dsFloatFlag_slack-15.0

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@github-actions github-actions bot added this to the v15.0.5 milestone Aug 14, 2024
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt timvaillancourt changed the title slack-15.0: support v19-style timeout values slack-15.0: support v19-style --queryserver-config-*-timeout values Aug 14, 2024
@timvaillancourt timvaillancourt marked this pull request as ready for review August 14, 2024 20:11
@timvaillancourt timvaillancourt requested a review from a team as a code owner August 14, 2024 20:11
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt timvaillancourt changed the title slack-15.0: support v19-style --queryserver-config-*-timeout values slack-15.0: support v17+ --queryserver-config-*-timeout flag values Aug 14, 2024
@timvaillancourt timvaillancourt changed the title slack-15.0: support v17+ --queryserver-config-*-timeout flag values slack-15.0: support v17+ --queryserver-config-* duration values Aug 14, 2024
timvaillancourt and others added 3 commits August 15, 2024 15:07
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
* fakesqldb: Guard query log usage with lock

This lock is used around adding to the query log, but it means we also
need to use the lock when reading from it or when resetting it.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* grpcvtctldserver: Fix alias for loop reuse

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* unit_race: Increase runtime

We've been adding a lot of tests for the evalengine and we're bumping up
to the timeout.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

---------

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Copy link

Thanks for the contribution! Before we can merge this, we need @dbussink to sign the Salesforce Inc. Contributor License Agreement.

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
@timvaillancourt timvaillancourt merged commit 3a56f70 into slack-15.0 Aug 20, 2024
193 of 194 checks passed
@timvaillancourt timvaillancourt deleted the DurationOrSecondsFloatFlag_slack-15.0 branch August 20, 2024 17:24
makinje16 pushed a commit that referenced this pull request Aug 28, 2024
…492)

* WIP

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* update all flags

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* update e2e flag test

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* 2 missing flags

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* rename Type()

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* empty commit to test ci

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* fakesqldb: Guard query log usage with lock (vitessio#12813)

* fakesqldb: Guard query log usage with lock

This lock is used around adding to the query log, but it means we also
need to use the lock when reading from it or when resetting it.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* grpcvtctldserver: Fix alias for loop reuse

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* unit_race: Increase runtime

We've been adding a lot of tests for the evalengine and we're bumping up
to the timeout.

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

---------

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

* remove t.Parallel() like upstream did

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

---------

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>
Co-authored-by: Dirkjan Bussink <d.bussink@gmail.com>
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.

3 participants