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.

Sign up for GitHub

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

Jump to bottom

v18.0.8-shopify-1 #206

Open
wants to merge 12 commits into
base: v18.0.8-shopify-1
Choose a base branch
from
Open

v18.0.8-shopify-1 #206

wants to merge 12 commits into from
+1,857 −498

Conversation

shanth96
Copy link

@shanth96 shanth96 commented Jan 13, 2025 •
edited
Loading

In addition to all the commits reported by the script, I also cherry-picked vitessio@c3dc4a9 since that has a CVE fix for GHSA-7mwh-q3xm-qh6p

dev new_version_from_upstream 18.0.8
🔧  Running ruby version_builder_v2.rb --version from dev.yml
Ignoring eventmachine-1.2.7 because its extensions are not built. Try: gem pristine eventmachine --version 1.2.7
Using previous Shopify release: v18.0.5-shopify-7
The following commits are necessary for upstream version 18.0.8:
b0cad30bb6fec992757b5fb23f36627382d11a4f, PR: 146
f258063b0038c0ea7e88e9c051d55737017db7a3, PR: 102
33b59621d9db30784a01906a9d63d1db9f8f8cc4, PR: 148
fabdae5da26b4fc33a82875659aaa68cb0d6d0d6, PR: 155
a4df282a5cde6e27f98201162b80e3d44ccccec9, PR: 161
aa73e7fb7d91c6a8fc76a7af5665e7da894ccf06, PR: 164
4b24c58989675babc2056fe68c8f9f08b48d0a7d, PR: 175
ede4ad1af81ac6bed0a395fbc59e4b1cc159183b, PR: 184
8ba1756e085222c9480bde349491d7166582f2f8, PR: 187
fc128dcbeec642e5f21fcc1d4b1a5217a2717f0e, PR: 192
a46ede6d9db4e5d98b8fbf058da4f15d42eb4e21, PR: 201

The following commits have already been applied to v18.0.8-shopify-1-candidate:

b0cad30bb6fec992757b5fb23f36627382d11a4f, PR: 146
f258063b0038c0ea7e88e9c051d55737017db7a3, PR: 102
33b59621d9db30784a01906a9d63d1db9f8f8cc4, PR: 148
fabdae5da26b4fc33a82875659aaa68cb0d6d0d6, PR: 155
a4df282a5cde6e27f98201162b80e3d44ccccec9, PR: 161
aa73e7fb7d91c6a8fc76a7af5665e7da894ccf06, PR: 164
4b24c58989675babc2056fe68c8f9f08b48d0a7d, PR: 175
ede4ad1af81ac6bed0a395fbc59e4b1cc159183b, PR: 184
8ba1756e085222c9480bde349491d7166582f2f8, PR: 187
fc128dcbeec642e5f21fcc1d4b1a5217a2717f0e, PR: 192
a46ede6d9db4e5d98b8fbf058da4f15d42eb4e21, PR: 201

All commits have been applied.

jeremycole and others added 5 commits January 13, 2025 14:40
@jeremycole @shanth96
Add new placement Vindex strategy
b9ec560 
Signed-off-by: Jeremy Cole <[email protected]>

Sprinkle addPadding everywhere when comparing KeyRange Start/End values

Implement support for PartialVindex usage

Signed-off-by: Jeremy Cole <[email protected]>
(cherry picked from commit 7424fff)
(cherry picked from commit 69e6248)
(cherry picked from commit 8390560)
(cherry picked from commit b0cad30)
@brendar @shanth96
Merge pull request #102 from Shopify/generate-cachedsize-for-placemen…
9c9c388 
…t-vindex

Generate CachedSize function for Placement vindex

(cherry picked from commit 986ffc6)
(cherry picked from commit 1fe7126)
(cherry picked from commit 62a60b2)
(cherry picked from commit f258063)
@shanth96
Merge pull request #148 from Shopify/fix-tests
5adbabd 
Run all relevant tests on all PRs

(cherry picked from commit b55dd26)
(cherry picked from commit 8feee14)
(cherry picked from commit 6bc3c08)
(cherry picked from commit 33b5962)
@pawandubey @shanth96
Merge pull request #155 from Shopify/candidate-v15.0.3-shopify-11
6dc9e6f 
Backport: set vreplication net read and net write timeout session vars to high values
(cherry picked from commit 84ea974)
(cherry picked from commit 5cc2dfc)
(cherry picked from commit dde1210)
(cherry picked from commit fabdae5)
@shivnagarajan @shanth96
Merge pull request #161 from Shopify/fix_e2e_test_v17
89d39d2 
fix for e2e test issue on v17

(cherry picked from commit 6a86fc9)
(cherry picked from commit a4df282)
@shanth96 shanth96 requested review from jgnagy and brendar January 13, 2025 21:47
@shanth96 shanth96 force-pushed the v18.0.8-shopify-1-candidate branch 12 times, most recently from 01dcdfb to 15e1fed Compare January 15, 2025 19:45
shivnagarajan and others added 7 commits January 15, 2025 14:50
@shivnagarajan @shanth96
Merge pull request #164 from Shopify/fix_tests_for_v18
2215d2b 
fix tests for CI

(cherry picked from commit aa73e7f)
@brendar @shanth96
Merge pull request #175 from Shopify/v19.0.4-shopify-2-candidate-back…
3b960ce 
…port-vtcombo-vschema

Backport: VTCombo: Ensure VSchema exists when creating keyspace (vitessio#16094)
(cherry picked from commit 4b24c58)
@brendar @shanth96
Merge pull request #184 from Shopify/v18.0.5-shopify-4-backport-vtcom…
2627630 
…bo-conn-leak

Backport v18: vtcombo: close query service on drop database

(cherry picked from commit ede4ad1)
@brendar @shanth96
Merge pull request #187 from Shopify/backport-graceful-vtgate-shutdow…
29adadf 
…n-to-v18

Backport: Gracefully shutdown VTGate instances
(cherry picked from commit 8ba1756)
@shanth96
Merge pull request #192 from Shopify/zk-conn-fix
bd1a0c2 
Fix zookeeper connection leak

(cherry picked from commit fc128dc)
@brendar @shanth96
Merge pull request #201 from Shopify/fix-v18-tablet-removed-from-heal…
1585656 
…thcheck-on-topo-error

Fix v18 tablets removed from healthcheck when topo server GetTablet call fails

(cherry picked from commit a46ede6)
@dbussink @shanth96
Merge commit from fork
bf89367 
These templates were rendered using text/template which is fundamentally
broken as it would allow for trivial HTML injection.

Instead render using safehtml/template so that we have automatic
escaping.

Signed-off-by: Dirkjan Bussink <[email protected]>
@shanth96 shanth96 force-pushed the v18.0.8-shopify-1-candidate branch from 15e1fed to bf89367 Compare January 15, 2025 19:50
@shanth96
Copy link
Author

This is now ready to review.

Note: percona-xtrabackup-24 is not available in ubuntu-24.04 hence why the 5 test failures.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jgnagy jgnagy Awaiting requested review from jgnagy

@brendar brendar Awaiting requested review from brendar

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@shanth96 @jeremycole @brendar @pawandubey @shivnagarajan @dbussink