Merge branch 'master' into enum-to-varchar
This commit is contained in:
Shlomi Noach
GitHub
commit
c90556e29b
5
.github/workflows/replica-tests.yml
vendored
5
.github/workflows/replica-tests.yml
vendored
|
|
@ -6,6 +6,9 @@ jobs:
|
|||
build:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
version: [mysql-5.5.62,mysql-5.6.43,mysql-5.7.25,mysql-8.0.16]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
|
@ -16,4 +19,6 @@ jobs:
|
|||
go-version: 1.14
|
||||
|
||||
- name: migration tests
|
||||
env:
|
||||
TEST_MYSQL_VERSION: ${{ matrix.version }}
|
||||
run: script/cibuild-gh-ost-replica-tests
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# gh-ost
|
||||
|
||||
[](https://travis-ci.org/github/gh-ost) [](https://github.com/github/gh-ost/releases) [](https://github.com/github/gh-ost/releases)
|
||||
[](https://github.com/github/gh-ost/actions/workflows/ci.yml) [](https://github.com/github/gh-ost/actions/workflows/replica-tests.yml) [](https://github.com/github/gh-ost/releases) [](https://github.com/github/gh-ost/releases)
|
||||
|
||||
#### GitHub's online schema migration for MySQL <img src="doc/images/gh-ost-logo-light-160.png" align="right">
|
||||
|
||||
|
|
|
|||
2
build.sh
2
build.sh
|
|
@ -40,7 +40,7 @@ function build {
|
|||
builddir=$(setuptree)
|
||||
cp $buildpath/$target $builddir/gh-ost/usr/bin
|
||||
cd $buildpath
|
||||
fpm -v "${RELEASE_VERSION}" --epoch 1 -f -s dir -n gh-ost -m 'shlomi-noach <shlomi-noach+gh-ost-deb@github.com>' --description "GitHub's Online Schema Migrations for MySQL " --url "https://github.com/github/gh-ost" --vendor "GitHub" --license "Apache 2.0" -C $builddir/gh-ost --prefix=/ -t rpm .
|
||||
fpm -v "${RELEASE_VERSION}" --epoch 1 -f -s dir -n gh-ost -m 'shlomi-noach <shlomi-noach+gh-ost-deb@github.com>' --description "GitHub's Online Schema Migrations for MySQL " --url "https://github.com/github/gh-ost" --vendor "GitHub" --license "Apache 2.0" -C $builddir/gh-ost --prefix=/ -t rpm --rpm-rpmbuild-define "_build_id_links none" .
|
||||
fpm -v "${RELEASE_VERSION}" --epoch 1 -f -s dir -n gh-ost -m 'shlomi-noach <shlomi-noach+gh-ost-deb@github.com>' --description "GitHub's Online Schema Migrations for MySQL " --url "https://github.com/github/gh-ost" --vendor "GitHub" --license "Apache 2.0" -C $builddir/gh-ost --prefix=/ -t deb --deb-no-default-config-files .
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -540,7 +540,7 @@ func (this *Inspector) CountTableRows() error {
|
|||
|
||||
this.migrationContext.Log.Infof("As instructed, I'm issuing a SELECT COUNT(*) on the table. This may take a while")
|
||||
|
||||
query := fmt.Sprintf(`select /* gh-ost */ count(*) as rows from %s.%s`, sql.EscapeName(this.migrationContext.DatabaseName), sql.EscapeName(this.migrationContext.OriginalTableName))
|
||||
query := fmt.Sprintf(`select /* gh-ost */ count(*) as count_rows from %s.%s`, sql.EscapeName(this.migrationContext.DatabaseName), sql.EscapeName(this.migrationContext.OriginalTableName))
|
||||
var rowsEstimate int64
|
||||
if err := this.db.QueryRow(query).Scan(&rowsEstimate); err != nil {
|
||||
return err
|
||||
|
|
|
|||
|
|
@ -4,19 +4,25 @@ set -e
|
|||
|
||||
whoami
|
||||
|
||||
# Clone gh-ost-ci-env
|
||||
# Only clone if not already running locally at latest commit
|
||||
remote_commit=$(git ls-remote https://github.com/github/gh-ost-ci-env.git HEAD | cut -f1)
|
||||
local_commit="unknown"
|
||||
[ -d "gh-ost-ci-env" ] && local_commit=$(cd gh-ost-ci-env && git log --format="%H" -n 1)
|
||||
fetch_ci_env() {
|
||||
# Clone gh-ost-ci-env
|
||||
# Only clone if not already running locally at latest commit
|
||||
remote_commit=$(git ls-remote https://github.com/github/gh-ost-ci-env.git HEAD | cut -f1)
|
||||
local_commit="unknown"
|
||||
[ -d "gh-ost-ci-env" ] && local_commit=$(cd gh-ost-ci-env && git log --format="%H" -n 1)
|
||||
|
||||
echo "remote commit is: $remote_commit"
|
||||
echo "local commit is: $local_commit"
|
||||
echo "remote commit is: $remote_commit"
|
||||
echo "local commit is: $local_commit"
|
||||
|
||||
if [ "$remote_commit" != "$local_commit" ] ; then
|
||||
rm -rf ./gh-ost-ci-env
|
||||
git clone https://github.com/github/gh-ost-ci-env.git
|
||||
fi
|
||||
if [ "$remote_commit" != "$local_commit" ] ; then
|
||||
rm -rf ./gh-ost-ci-env
|
||||
git clone https://github.com/github/gh-ost-ci-env.git
|
||||
fi
|
||||
}
|
||||
|
||||
test_dbdeployer() {
|
||||
gh-ost-ci-env/bin/linux/dbdeployer --version
|
||||
}
|
||||
|
||||
test_mysql_version() {
|
||||
local mysql_version
|
||||
|
|
@ -30,17 +36,18 @@ test_mysql_version() {
|
|||
|
||||
mkdir -p sandbox/binary
|
||||
rm -rf sandbox/binary/*
|
||||
gh-ost-ci-env/bin/linux/dbdeployer unpack gh-ost-ci-env/mysql-tarballs/"$mysql_version".tar.gz --unpack-version="$mysql_version" --sandbox-binary ${PWD}/sandbox/binary
|
||||
gh-ost-ci-env/bin/linux/dbdeployer unpack gh-ost-ci-env/mysql-tarballs/"$mysql_version".tar.xz --sandbox-binary ${PWD}/sandbox/binary
|
||||
|
||||
mkdir -p sandboxes
|
||||
rm -rf sandboxes/*
|
||||
|
||||
if echo "$mysql_version" | egrep "5[.]5[.]" ; then
|
||||
local mysql_version_num=${mysql_version#*-}
|
||||
if echo "$mysql_version_num" | egrep "5[.]5[.]" ; then
|
||||
gtid=""
|
||||
else
|
||||
gtid="--gtid"
|
||||
fi
|
||||
gh-ost-ci-env/bin/linux/dbdeployer deploy replication "$mysql_version" --nodes 2 --sandbox-binary ${PWD}/sandbox/binary --sandbox-home ${PWD}/sandboxes ${gtid} --my-cnf-options log_slave_updates --my-cnf-options log_bin --my-cnf-options binlog_format=ROW --sandbox-directory rsandbox
|
||||
gh-ost-ci-env/bin/linux/dbdeployer deploy replication "$mysql_version_num" --nodes 2 --sandbox-binary ${PWD}/sandbox/binary --sandbox-home ${PWD}/sandboxes ${gtid} --my-cnf-options log_slave_updates --my-cnf-options log_bin --my-cnf-options binlog_format=ROW --sandbox-directory rsandbox
|
||||
|
||||
sed '/sandboxes/d' -i gh-ost-ci-env/bin/gh-ost-test-mysql-master
|
||||
echo 'sandboxes/rsandbox/m "$@"' >> gh-ost-ci-env/bin/gh-ost-test-mysql-master
|
||||
|
|
@ -59,12 +66,26 @@ test_mysql_version() {
|
|||
find sandboxes -name "stop_all" | bash
|
||||
}
|
||||
|
||||
echo "Building..."
|
||||
. script/build
|
||||
# Test all versions:
|
||||
find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.gz" | while read f ; do basename $f ".tar.gz" ; done | sort -r | while read mysql_version ; do
|
||||
echo "found MySQL version: $mysql_version"
|
||||
done
|
||||
find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.gz" | while read f ; do basename $f ".tar.gz" ; done | sort -r | while read mysql_version ; do
|
||||
test_mysql_version "$mysql_version"
|
||||
done
|
||||
main() {
|
||||
fetch_ci_env
|
||||
test_dbdeployer
|
||||
|
||||
echo "Building..."
|
||||
. script/build
|
||||
|
||||
# TEST_MYSQL_VERSION is set by the replica-tests CI job
|
||||
if [ -z "$TEST_MYSQL_VERSION" ]; then
|
||||
# Test all versions:
|
||||
find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.xz" | while read f ; do basename $f ".tar.xz" ; done | sort -r | while read mysql_version ; do
|
||||
echo "found MySQL version: $mysql_version"
|
||||
done
|
||||
find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.xz" | while read f ; do basename $f ".tar.xz" ; done | sort -r | while read mysql_version ; do
|
||||
test_mysql_version "$mysql_version"
|
||||
done
|
||||
else
|
||||
echo "found MySQL version: $TEST_MYSQL_VERSION"
|
||||
test_mysql_version "$TEST_MYSQL_VERSION"
|
||||
fi
|
||||
}
|
||||
|
||||
main
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user