-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
adding new mysql shell backup engine #16295
Merged
Merged
Changes from 43 commits
Commits
Show all changes
44 commits
Select commit
Hold shift + click to select a range
1f70afb
adding new mysql shell backup engine
rvrangel 58005ab
change flags
rvrangel b74a87f
fix TestHelpOutput
rvrangel c51ee4b
add unit test for scanLinesToLogger
rvrangel 6e59215
PR feedback
rvrangel abe1d11
Merge branch 'master' into mysqlshell-backup
rvrangel 3ca4b3b
PR feedback + fix tests
rvrangel d26b5c3
more improvements
rvrangel 0a5fda4
fix unit test
rvrangel 4aae34b
Merge branch 'master' into mysqlshell-backup
rvrangel 7116317
fix tests
rvrangel c2d41ac
PR feedback
rvrangel 8c6c665
regenerate ci workflows
rvrangel 0bb5631
add mysql-shell package as part of the standard mysql CI dependencies
rvrangel 82a288c
use dumpInstances() instead
rvrangel d9407f2
remove case XtraBackup, MySQLShell
rvrangel 287a500
Merge branch 'master' into mysqlshell-backup
rvrangel 31ba57e
make generate_ci_workflows
rvrangel 31c27b5
update flags and operator.yaml
rvrangel e62ae95
removing DeleteBeforeRestore
rvrangel 99f08ea
fixing tests
rvrangel 589c81b
Merge branch 'master' into mysqlshell-backup
rvrangel 4257ae4
Revert "fixing tests"
rvrangel e958558
Revert "removing DeleteBeforeRestore"
rvrangel 2e8c441
make generate_ci_workflows
rvrangel 64b52e6
Merge branch 'master' into mysqlshell-backup
rvrangel 75b2b76
make generate_ci_workflows
rvrangel 85fba81
deleting users + other dbs
rvrangel 21f2604
update flags
rvrangel 47dc753
make sure vitess default matches mysqlshell's
rvrangel 5c08cc7
do not remove users if not loading them
rvrangel e37dbbb
changelog notice
rvrangel 4418592
Merge branch 'master' into mysqlshell-backup
rvrangel 9243f22
add ShouldStartMySQLAfterRestore()
rvrangel 4e79a02
backup_pitr testing: validate rejoining replication stream
shlomi-noach 7e77e86
test replication stream in ExecTestIncrementalBackupAndRestoreToTimes…
shlomi-noach 1d5aaab
Merge branch 'main' into mysqlshell-backup
shlomi-noach 1fa6191
Merge branch 'backup-pitr-replication' into mysqlshell-backup
shlomi-noach 3c655a1
add missing grant
rvrangel 4e0a0e2
update vitess operator example
rvrangel 9218186
PR feedback
rvrangel 301e95c
Merge remote-tracking branch 'origin/main' into mysqlshell-backup
shlomi-noach ae42af7
resolved conflict
shlomi-noach bc2cff2
add missing grant
rvrangel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
157 changes: 157 additions & 0 deletions
157
.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,157 @@ | ||
# DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows" | ||
|
||
name: Cluster (backup_pitr_mysqlshell) | ||
on: [push, pull_request] | ||
concurrency: | ||
group: format('{0}-{1}', ${{ github.ref }}, 'Cluster (backup_pitr_mysqlshell)') | ||
cancel-in-progress: true | ||
|
||
permissions: read-all | ||
|
||
env: | ||
LAUNCHABLE_ORGANIZATION: "vitess" | ||
LAUNCHABLE_WORKSPACE: "vitess-app" | ||
GITHUB_PR_HEAD_SHA: "${{ github.event.pull_request.head.sha }}" | ||
|
||
jobs: | ||
build: | ||
name: Run endtoend tests on Cluster (backup_pitr_mysqlshell) | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- name: Skip CI | ||
run: | | ||
if [[ "${{contains( github.event.pull_request.labels.*.name, 'Skip CI')}}" == "true" ]]; then | ||
echo "skipping CI due to the 'Skip CI' label" | ||
exit 1 | ||
fi | ||
|
||
- name: Check if workflow needs to be skipped | ||
id: skip-workflow | ||
run: | | ||
skip='false' | ||
if [[ "${{github.event.pull_request}}" == "" ]] && [[ "${{github.ref}}" != "refs/heads/main" ]] && [[ ! "${{github.ref}}" =~ ^refs/heads/release-[0-9]+\.[0-9]$ ]] && [[ ! "${{github.ref}}" =~ "refs/tags/.*" ]]; then | ||
skip='true' | ||
fi | ||
echo Skip ${skip} | ||
echo "skip-workflow=${skip}" >> $GITHUB_OUTPUT | ||
|
||
PR_DATA=$(curl -s\ | ||
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ | ||
-H "Accept: application/vnd.github.v3+json" \ | ||
"https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}") | ||
draft=$(echo "$PR_DATA" | jq .draft -r) | ||
echo "is_draft=${draft}" >> $GITHUB_OUTPUT | ||
|
||
- name: Check out code | ||
if: steps.skip-workflow.outputs.skip-workflow == 'false' | ||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 | ||
|
||
- name: Check for changes in relevant files | ||
if: steps.skip-workflow.outputs.skip-workflow == 'false' | ||
uses: dorny/paths-filter@ebc4d7e9ebcb0b1eb21480bb8f43113e996ac77a # v3.0.1 | ||
id: changes | ||
with: | ||
token: '' | ||
filters: | | ||
end_to_end: | ||
- 'go/**/*.go' | ||
- 'go/vt/sidecardb/**/*.sql' | ||
- 'go/test/endtoend/onlineddl/vrepl_suite/**' | ||
- 'test.go' | ||
- 'Makefile' | ||
- 'build.env' | ||
- 'go.sum' | ||
- 'go.mod' | ||
- 'proto/*.proto' | ||
- 'tools/**' | ||
- 'config/**' | ||
- 'bootstrap.sh' | ||
- '.github/workflows/cluster_endtoend_backup_pitr_mysqlshell.yml' | ||
|
||
- name: Set up Go | ||
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' | ||
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 | ||
with: | ||
go-version: 1.23.1 | ||
|
||
- name: Set up python | ||
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' | ||
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1 | ||
|
||
- name: Tune the OS | ||
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' | ||
run: | | ||
# Limit local port range to not use ports that overlap with server side | ||
# ports that we listen on. | ||
sudo sysctl -w net.ipv4.ip_local_port_range="22768 65535" | ||
# Increase the asynchronous non-blocking I/O. More information at https://dev.mysql.com/doc/refman/5.7/en/innodb-parameters.html#sysvar_innodb_use_native_aio | ||
echo "fs.aio-max-nr = 1048576" | sudo tee -a /etc/sysctl.conf | ||
sudo sysctl -p /etc/sysctl.conf | ||
|
||
- name: Get dependencies | ||
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' | ||
run: | | ||
|
||
# Get key to latest MySQL repo | ||
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A8D3785C | ||
# Setup MySQL 8.0 | ||
wget -c https://dev.mysql.com/get/mysql-apt-config_0.8.32-1_all.deb | ||
echo mysql-apt-config mysql-apt-config/select-server select mysql-8.0 | sudo debconf-set-selections | ||
sudo DEBIAN_FRONTEND="noninteractive" dpkg -i mysql-apt-config* | ||
sudo apt-get -qq update | ||
# Install everything else we need, and configure | ||
sudo apt-get -qq install -y mysql-server mysql-shell mysql-client make unzip g++ etcd curl git wget eatmydata xz-utils libncurses5 | ||
|
||
sudo service mysql stop | ||
sudo service etcd stop | ||
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/ | ||
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld | ||
go mod download | ||
|
||
# install JUnit report formatter | ||
go install github.com/vitessio/go-junit-report@HEAD | ||
|
||
- name: Setup launchable dependencies | ||
if: steps.skip-workflow.outputs.is_draft == 'false' && steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && github.base_ref == 'main' | ||
run: | | ||
# Get Launchable CLI installed. If you can, make it a part of the builder image to speed things up | ||
pip3 install --user launchable~=1.0 > /dev/null | ||
|
||
# verify that launchable setup is all correct. | ||
launchable verify || true | ||
|
||
# Tell Launchable about the build you are producing and testing | ||
launchable record build --name "$GITHUB_RUN_ID" --no-commit-collection --source . | ||
|
||
- name: Run cluster endtoend test | ||
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' | ||
timeout-minutes: 45 | ||
run: | | ||
# We set the VTDATAROOT to the /tmp folder to reduce the file path of mysql.sock file | ||
# which musn't be more than 107 characters long. | ||
export VTDATAROOT="/tmp/" | ||
source build.env | ||
|
||
set -exo pipefail | ||
|
||
# run the tests however you normally do, then produce a JUnit XML file | ||
eatmydata -- go run test.go -docker=false -follow -shard backup_pitr_mysqlshell | tee -a output.txt | go-junit-report -set-exit-code > report.xml | ||
|
||
- name: Print test output and Record test result in launchable if PR is not a draft | ||
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && always() | ||
run: | | ||
if [[ "${{steps.skip-workflow.outputs.is_draft}}" == "false" ]]; then | ||
# send recorded tests to launchable | ||
launchable record tests --build "$GITHUB_RUN_ID" go-test . || true | ||
fi | ||
|
||
# print test output | ||
cat output.txt | ||
|
||
- name: Test Summary | ||
if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' && always() | ||
uses: test-summary/action@31493c76ec9e7aa675f1585d3ed6f1da69269a86 # v2.4 | ||
with: | ||
paths: "report.xml" | ||
show: "fail, skip" |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's think about marking this new workflow as required when merging the PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed. We'll give it a couple weeks until all open PRs are in sync, then we'll make it
Required
.