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 vitess r12.0.5 vtctld cherrypicks #12

Merged

Conversation

tanjinx
Copy link

@tanjinx tanjinx commented Sep 29, 2022

Description

These are cherrypicks needed in vtctld for vtadmin UI to work, similarly as what we did in v11 upgrade through PR
tinyspeck#247.

However, the majority changes in tinyspeck#247 are already in v12, so in this PR, just backport those are not in v12.

The branch slack-vitess-r12.0.5-vtctld is based on the v12 release branch slack-vitess-r12.0.5, and slack-vitess-r12.0.5-vtctld will be used for deployment.

For reference:

This will serve as the base branch for 11.x vtctld branches, and should not be merged into master.

I compiled a list of cherry picks you see below from the following PRs:

https://github.com/tinyspeck/vitess/pull/231
https://github.com/tinyspeck/vitess/pull/232
https://github.com/tinyspeck/vitess/pull/233
as PER: https://paper.dropbox.com/doc/Deploys--BiBeEroaHSASXm33RaJsy5GMAg-4DTMhk7UnGtetj5tqzJ75#:h2=But-where-do-the-cherry-picks-

and started to apply them to this branch using:

git cherry-pick -m1 {pr-merge-sha}
all cherry picks with [x] are done, the rest still need to be applied manually. It's a very tedious process due to many (and I mean MANY conflicts that need to be resolved manually). There are also a number of proto conflicts on generated files which I attempted to fix as follows:

make install_protoc-gen-go
make proto
From https://github.com/tinyspeck/vitess/pull/231:
 https://github.com/tinyspeck/vitess/commit/4932904f84725c10703a519c9e7ae249cbd60668 https://github.com/vitessio/vitess/pull/7965
 https://github.com/tinyspeck/vitess/commit/8e0531f5983f1c8f4151fdacf2c71132a232f725 https://github.com/vitessio/vitess/pull/7992
 https://github.com/tinyspeck/vitess/commit/0a5e76bec8ac0836d139561d06e2ccfe11c0b776 https://github.com/vitessio/vitess/pull/8052
 https://github.com/tinyspeck/vitess/commit/c85a5c266f6b79204c40153f17e2c1a21015797f https://github.com/vitessio/vitess/pull/8084
 https://github.com/tinyspeck/vitess/commit/69b9833c5ef03c68b4582becb661e9c5f5fcbf27 https://github.com/vitessio/vitess/pull/8221
 https://github.com/tinyspeck/vitess/commit/4c33b2b5a90dc200e6cc649681cbace2520725bd https://github.com/vitessio/vitess/pull/8197
 https://github.com/tinyspeck/vitess/commit/82c9752e0d85e913dbc49f578cb6d89a5a406e7b https://github.com/vitessio/vitess/pull/8199
 https://github.com/tinyspeck/vitess/commit/2a92daecbff8524fd1e202696594c752a33f98f0 https://github.com/vitessio/vitess/pull/8219
 https://github.com/tinyspeck/vitess/commit/5374002ec7f627d6e14647d78eb74788e089ac74 https://github.com/vitessio/vitess/pull/8232
 https://github.com/tinyspeck/vitess/commit/f97942a03d34548984ccf456506fd0bb8dbd966e https://github.com/vitessio/vitess/pull/8261
 https://github.com/tinyspeck/vitess/commit/405b4ba280c40511c32e1aadf001feb7ca69fe1c https://github.com/vitessio/vitess/pull/8266
 https://github.com/tinyspeck/vitess/commit/a3c34a3b1afd5d73edabc2c7b273089e870c36c9 https://github.com/vitessio/vitess/pull/8272
 https://github.com/tinyspeck/vitess/commit/ba8f8079fd94debddbf57b78bd8aba987fab4320 https://github.com/vitessio/vitess/pull/8284
 https://github.com/tinyspeck/vitess/commit/7dfbc60e9ccff7f4c53584729ca7c23abd7d6dfd https://github.com/vitessio/vitess/pull/8113
 https://github.com/tinyspeck/vitess/commit/3c0a253aa10602458d3b2fb0f1b379b6dafec498 https://github.com/vitessio/vitess/pull/8285
 https://github.com/tinyspeck/vitess/commit/0ff5ccca97e7c016534a17d45a84a59a75167945 https://github.com/vitessio/vitess/pull/8289
 https://github.com/tinyspeck/vitess/commit/d9fa9f2cd585b82ccfb000f0db6b16d3dde21fd6 https://github.com/vitessio/vitess/pull/8291
 https://github.com/tinyspeck/vitess/commit/46406453b490c2a21351db3b7f0a336cb453481e https://github.com/vitessio/vitess/pull/8320
 https://github.com/tinyspeck/vitess/commit/83dfb9aa59ce47a313ecb7bc12804298e76d350c https://github.com/vitessio/vitess/pull/8321
 https://github.com/tinyspeck/vitess/commit/a59c8a0a8d0014e8a1f564d9c97b3d1cf6255fad https://github.com/vitessio/vitess/pull/8402
 https://github.com/tinyspeck/vitess/commit/ee646092d636e5823891dc11224348607050f74b https://github.com/tinyspeck/vitess/pull/218 ( applied manually git cherry-pick -m1 ee64609 )
From https://github.com/tinyspeck/vitess/pull/232
 https://github.com/tinyspeck/vitess/commit/a8679df220721ca2bfc50b3c3b8d85321c4fcfc3 https://github.com/vitessio/vitess/pull/8368 ( applied manually git cherry-pick -m1 a8679df )
From https://github.com/tinyspeck/vitess/pull/233
 https://github.com/tinyspeck/vitess/commit/36657df49c6c4584a6442d5f10d0c8b117f5a4ab https://github.com/vitessio/vitess/pull/8296
 https://github.com/tinyspeck/vitess/commit/48f22aa56e800a98030962550642272b1c3cccb9 https://github.com/vitessio/vitess/pull/8134
 https://github.com/tinyspeck/vitess/commit/b9664922be1a119a833616a07d114eefbe9949dd Fix for padding in OrderAndCheckPartitions  vitessio/vitess#8873 ( applied manually git cherry-pick -m1 b966492 )
From TBD...
This is the section that still needs to be compiled as per:

any new vtctld changes since the last deploy
REF: https://paper.dropbox.com/doc/Deploys--BiBeEroaHSASXm33RaJsy5GMAg-4DTMhk7UnGtetj5tqzJ75#:h2=But-where-do-the-cherry-picks-

Related Issue(s)

Checklist

  • "Backport me!" label has been added if this change should be backported
  • Tests were added or are not required
  • Documentation was added or is not required

Deployment Notes

@tanjinx tanjinx merged commit 69803e9 into slack-vitess-r12.0.5-vtctld Sep 29, 2022
@tanjinx tanjinx added the v12 label Dec 9, 2022
@tanjinx tanjinx added the legacy label Feb 17, 2023
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.

2 participants