Merge branch 'master' of github.com:vitessio/vitess into create-database

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

.github/workflows/cluster_endtoend_11.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (11)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_12.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (12)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_13.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (13)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_14.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (14)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_15.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (15)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_16.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (16)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_17.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (17)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_18.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (18)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_19.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (19)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_20.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (20)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_21.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (21)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_22.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (22)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_23.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (23)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_24.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (24)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_26.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (26)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_27.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (27)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_onlineddl_ghost.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (onlineddl_ghost)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_onlineddl_revert.yml

@@ -0,0 +1,40 @@
+# DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows"
+
+name: Cluster (onlineddl_revert)
+on: [push, pull_request]
+jobs:
+
+  build:
+    name: Run endtoend tests on Cluster (onlineddl_revert)
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Set up Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.15
+
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Get dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget eatmydata
+        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
+
+        wget https://repo.percona.com/apt/percona-release_latest.$(lsb_release -sc)_all.deb
+        sudo apt-get install -y gnupg2
+        sudo dpkg -i percona-release_latest.$(lsb_release -sc)_all.deb
+        sudo apt-get update
+        sudo apt-get install percona-xtrabackup-24
+
+    - name: Run cluster endtoend test
+      timeout-minutes: 30
+      run: |
+        source build.env
+        eatmydata -- go run test.go -docker=false -print-log -follow -shard onlineddl_revert

.github/workflows/cluster_endtoend_onlineddl_vrepl.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (onlineddl_vrepl)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (onlineddl_vrepl_stress)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_vreplication_basic.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (vreplication_basic)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_vreplication_cellalias.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (vreplication_cellalias)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_vreplication_migrate.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (vreplication_migrate)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_vreplication_multicell.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (vreplication_multicell)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/cluster_endtoend_vreplication_v2.yml

@@ -6,7 +6,7 @@ jobs:
 
   build:
     name: Run endtoend tests on Cluster (vreplication_v2)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/endtoend.yml

@@ -4,7 +4,7 @@ jobs:
 
   build:
     name: End-to-End Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
 
     - name: Set up Go

.github/workflows/unit_race.yml

@@ -4,7 +4,7 @@ jobs:
 
   build:
     name: Unit Test (Race)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
 
     - name: Set up Go

.github/workflows/unit_test_mariadb101.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/unit_test_mariadb102.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/unit_test_mariadb103.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/unit_test_mysql57.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/unit_test_mysql80.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

.github/workflows/unit_test_percona56.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: Set up Go

docker/lite/Dockerfile.ubi7.mysql57

@@ -61,7 +61,7 @@ RUN yum update -y --setopt=alwaysprompt=no --setopt=tsflags=nodocs \
     mysql-community-client mysql-community-server \
 # Have to use hacks to ignore conflicts on /etc/my.cnf install
  && mkdir -p /tmp/1 \
- && yum install -y --setopt=alwaysprompt=no --downloadonly --downloaddir=/tmp/1 --enablerepo mysql57-community --disablerepo mysql80-community percona-xtrabackup-24 \
+ && yum install -y --setopt=alwaysprompt=no --downloadonly --downloaddir=/tmp/1 --enablerepo mysql57-community --disablerepo mysql80-community percona-xtrabackup-24 percona-toolkit \
  && rpm -Uvh --replacefiles /tmp/1/*rpm \
  && rm -rf /tmp/1 \
  && yum clean all \

docker/lite/Dockerfile.ubi7.mysql80

@@ -61,7 +61,7 @@ RUN yum update -y --setopt=alwaysprompt=no --setopt=tsflags=nodocs \
     mysql-community-client mysql-community-server \
 # Have to use hacks to ignore conflicts on /etc/my.cnf install
  && mkdir -p /tmp/1 \
- && yum install -y --setopt=alwaysprompt=no --downloadonly --downloaddir=/tmp/1 --enablerepo mysql80-community --disablerepo mysql57-community percona-xtrabackup-80 \
+ && yum install -y --setopt=alwaysprompt=no --downloadonly --downloaddir=/tmp/1 --enablerepo mysql80-community --disablerepo mysql57-community percona-xtrabackup-80 percona-toolkit \
  && rpm -Uvh --replacefiles /tmp/1/*rpm \
  && rm -rf /tmp/1 \
  && yum clean all \

docker/lite/Dockerfile.ubi7.percona57

@@ -55,7 +55,7 @@ RUN yum update -y --setopt=alwaysprompt=no --setopt=tsflags=nodocs \
     jemalloc gperftools-libs procps-ng rsync wget openssl hostname curl tzdata make \
 # Can't use alwaysprompt=no here, since we need to pick up deps
 #   No way to separate key imports and accept deps separately in yum/dnf
- && yum install -y --setopt=tsflags=nodocs Percona-Server-server-57 percona-xtrabackup-24 \
+ && yum install -y --setopt=tsflags=nodocs Percona-Server-server-57 percona-xtrabackup-24 percona-toolkit \
  && yum clean all \
  && rm -rf /etc/my.cnf /var/lib/mysql /tmp/gpg /sbin/mysqld-debug
 

docker/lite/Dockerfile.ubi7.percona80

@@ -59,7 +59,7 @@ RUN yum update -y --setopt=alwaysprompt=no --setopt=tsflags=nodocs \
  && sleep 5 \
 # Can't use alwaysprompt=no here, since we need to pick up deps
 #   No way to separate key imports and accept deps separately in yum/dnf
- && yum install -y --setopt=tsflags=nodocs percona-server-server percona-xtrabackup-80 \
+ && yum install -y --setopt=tsflags=nodocs percona-server-server percona-xtrabackup-80 percona-toolkit \
  && yum clean all \
  && rm -rf /etc/my.cnf /var/lib/mysql /tmp/gpg /sbin/mysqld-debug
 

docker/lite/install_dependencies.sh

@@ -58,6 +58,7 @@ BASE_PACKAGES=(
     sysstat
     wget
     curl
+    percona-toolkit
 )
 
 apt-get update

docker/vttestserver/Dockerfile.mysql57

@@ -55,4 +55,7 @@ COPY --from=builder --chown=vitess:vitess /vt/install /vt
 VOLUME /vt/vtdataroot
 USER vitess
 
-CMD /vt/bin/vttestserver -port $PORT -keyspaces $KEYSPACES -num_shards $NUM_SHARDS -mysql_bind_host ${MYSQL_BIND_HOST:-127.0.0.1} -mysql_server_version ${MYSQL_SERVER_VERSION:-5.7.9-vitess}
+COPY docker/vttestserver/setup_vschema_folder.sh /vt/setup_vschema_folder.sh
+COPY docker/vttestserver/run.sh /vt/run.sh
+
+CMD /vt/run.sh "5.7.9-vitess"

docker/vttestserver/Dockerfile.mysql80

@@ -55,4 +55,7 @@ COPY --from=builder --chown=vitess:vitess /vt/install /vt
 VOLUME /vt/vtdataroot
 USER vitess
 
-CMD /vt/bin/vttestserver -port $PORT -keyspaces $KEYSPACES -num_shards $NUM_SHARDS -mysql_bind_host ${MYSQL_BIND_HOST:-127.0.0.1} -mysql_server_version ${MYSQL_SERVER_VERSION:-8.0.21-vitess}
+COPY docker/vttestserver/setup_vschema_folder.sh /vt/setup_vschema_folder.sh
+COPY docker/vttestserver/run.sh /vt/run.sh
+
+CMD /vt/run.sh "8.0.21-vitess"