backport fixes of CVE tickets reported by Slack#5
Merged
tanjinx merged 3 commits intoslack-vitess-r12.0.5from Aug 18, 2022
Merged
backport fixes of CVE tickets reported by Slack#5tanjinx merged 3 commits intoslack-vitess-r12.0.5from
tanjinx merged 3 commits intoslack-vitess-r12.0.5from
Conversation
vmogilev
approved these changes
Aug 18, 2022
brirams
pushed a commit
that referenced
this pull request
Sep 22, 2022
* decouple olap tx timeout from oltp tx timeout
Since workload=olap bypasses the query timeouts
(--queryserver-config-query-timeout) and also row limits, the natural
assumption is that it also bypasses the transaction timeout.
This is not the case, e.g. for a tablet where the
--queryserver-config-transaction-timeout is 10.
This commit:
* Adds new CLI flag and YAML field to independently configure TX
timeouts for OLAP workloads (--queryserver-config-olap-transaction-timeout).
* Decouples TX kill interval from OLTP TX timeout via new CLI flag and
YAML field (--queryserver-config-transaction-killer-interval).
Signed-off-by: Max Englander <max@planetscale.com>
* decouple ol{a,t}p tx timeouts: pr comments #1
Signed-off-by: Max Englander <max@planetscale.com>
* decouple ol{a,t}p tx timeouts: pr comments #2 consolidate timeout logic in sc
Signed-off-by: Max Englander <max@planetscale.com>
* decouple ol{a,t}p tx timeouts: remove unused tx killer flag
Signed-off-by: Max Englander <max@planetscale.com>
* decouple ol{a,t}p tx timeouts: update 15_0_0_summary.md
Signed-off-by: Max Englander <max@planetscale.com>
* decouple ol{a,t}p tx timeouts: fix race cond
Signed-off-by: Max Englander <max@planetscale.com>
* decouple ol{a,t}p tx timeouts: pr comments #3 -txProps.timeout, +sc.expiryTime
Signed-off-by: Max Englander <max@planetscale.com>
* decouple ol{a,t}p tx timeouts: pr comments #4 -atomic.Value for expiryTime
Signed-off-by: Max Englander <max@planetscale.com>
* decouple ol{a,t}p tx timeouts: fix race cond (without atomic.Value)
Signed-off-by: Max Englander <max@planetscale.com>
* decouple ol{a,t}p tx timeouts: pr comments #5 -unused funcs, fix comments, set ticks interval once
Signed-off-by: Max Englander <max@planetscale.com>
* decouple ol{a,t}p tx timeouts: pr comments #5 +txkill tests
Signed-off-by: Max Englander <max@planetscale.com>
* revert fmt changes
Signed-off-by: Max Englander <max@planetscale.com>
* implement pr review suggestion
Signed-off-by: Max Englander <max@planetscale.com>
Signed-off-by: Max Englander <max@planetscale.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Backport Slack CVE fixes:
https://jira.tinyspeck.com/browse/DRE-7100
https://jira.tinyspeck.com/browse/DRE-7089
https://jira.tinyspeck.com/browse/DRE-7105
https://jira.tinyspeck.com/browse/DRE-7090
Related Issue(s)
Checklist
Deployment Notes