Update Dependency versions and change config files for MariaDB

bootstrap.sh

@@ -136,7 +136,7 @@ function install_grpc() {
   grpcio_ver=$version
   $PIP install --upgrade grpcio=="$grpcio_ver" grpcio-tools=="$grpcio_ver"
 }
-install_dep "gRPC" "1.10.0" "$VTROOT/dist/grpc" install_grpc
+install_dep "gRPC" "1.16.0" "$VTROOT/dist/grpc" install_grpc
 
 
 # Install protoc.
@@ -153,7 +153,7 @@ function install_protoc() {
   unzip "protoc-$version-$platform-x86_64.zip"
   ln -snf "$dist/bin/protoc" "$VTROOT/bin/protoc"
 }
-protoc_ver=3.5.1
+protoc_ver=3.6.1
 install_dep "protoc" "$protoc_ver" "$VTROOT/dist/vt-protoc-$protoc_ver" install_protoc
 
 
@@ -169,11 +169,11 @@ function install_zookeeper() {
   cp "$zk/contrib/fatjar/$zk-fatjar.jar" lib
   # TODO(sougou): when version changes, see if we can drop the 'zip -d' hack to get the fatjars working.
   #               If yes, also delete "zip" from the Dockerfile files and the manual build instructions again.
-  # 3.4.10 workaround: Delete META-INF files which should not be in there.
+  # 3.4.13 workaround: Delete META-INF files which should not be in there.
   zip -d "lib/$zk-fatjar.jar" 'META-INF/*.SF' 'META-INF/*.RSA' 'META-INF/*SF'
   rm -rf "$zk" "$zk.tar.gz"
 }
-zk_ver=3.4.10
+zk_ver=3.4.13
 install_dep "Zookeeper" "$zk_ver" "$VTROOT/dist/vt-zookeeper-$zk_ver" install_zookeeper
 
 
@@ -190,7 +190,7 @@ function install_etcd() {
   rm "$tar_file"
   ln -snf "$dist/etcd-${version}-linux-amd64/etcd" "$VTROOT/bin/etcd"
 }
-install_dep "etcd" "v3.1.0-rc.1" "$VTROOT/dist/etcd" install_etcd
+install_dep "etcd" "v3.3.10" "$VTROOT/dist/etcd" install_etcd
 
 
 # Download and install consul, link consul binary into our root.
@@ -203,7 +203,7 @@ function install_consul() {
   unzip "consul_${version}_linux_amd64.zip"
   ln -snf "$dist/consul" "$VTROOT/bin/consul"
 }
-install_dep "Consul" "1.0.6" "$VTROOT/dist/consul" install_consul
+install_dep "Consul" "1.4.0" "$VTROOT/dist/consul" install_consul
 
 
 # Install py-mock.
@@ -251,7 +251,7 @@ function install_chromedriver() {
   unzip -o -q chromedriver_linux64.zip -d "$dist"
   rm chromedriver_linux64.zip
 }
-install_dep "chromedriver" "2.40" "$VTROOT/dist/chromedriver" install_chromedriver
+install_dep "chromedriver" "2.44" "$VTROOT/dist/chromedriver" install_chromedriver
 
 
 #

config/mycnf/default-fast.cnf

@@ -22,7 +22,6 @@ innodb_log_file_size = 1M
 innodb_log_files_in_group = 2
 innodb_log_group_home_dir = {{.InnodbLogGroupHomeDir}}
 innodb_max_dirty_pages_pct = 75
-innodb_support_xa = 0
 innodb_thread_concurrency = 2
 key_buffer_size = 2M
 log-error = {{.ErrorLogPath}}
@@ -37,7 +36,6 @@ port = {{.MysqlPort}}
 read-only
 read_buffer_size = 1M
 read_rnd_buffer_size = 1M
-secure_file_priv = NULL
 server-id = {{.ServerID}}
 skip-name-resolve
 # we now need networking for replication. this is a tombstone to simpler times.

config/mycnf/default.cnf

@@ -26,17 +26,16 @@ innodb_thread_concurrency = 20
 key_buffer_size = 32M
 log-error = {{.ErrorLogPath}}
 long_query_time = 2
-max_allowed_packet = 16M
-max_connections = 100
+max_allowed_packet = 64M
+max_connections = 500
 net_write_timeout = 60
 pid-file = {{.PidFile}}
 port = {{.MysqlPort}}
 # all db instances should start in read-only mode - once the db is started and
 # fully functional, we'll push it into read-write mode
 read-only
-read_buffer_size = 1M
-read_rnd_buffer_size = 1M
-secure_file_priv = NULL
+read_buffer_size = 8M
+read_rnd_buffer_size = 8M
 server-id = {{.ServerID}}
 skip-name-resolve
 # all db instances should skip the slave startup - that way we can do any

config/mycnf/master_mysql56.cnf

@@ -4,6 +4,8 @@ gtid_mode = ON
 log_bin
 log_slave_updates
 enforce_gtid_consistency
+secure_file_priv = NULL
+innodb_support_xa = 0
 
 # Crash-safe replication settings.
 master_info_repository = TABLE

config/mycnf/production.cnf

@@ -0,0 +1,5 @@
+# Values for a production vitess deployment
+innodb_buffer_pool_size = 1024M
+innodb_log_file_size = 512M
+innodb_log_buffer_size = 64M
+max_connections = 1000

doc/GettingStarted.md

@@ -117,7 +117,7 @@ In addition, Vitess requires the software and libraries listed below.
 4.  Select a lock service from the options listed below. It is technically
     possible to use another lock server, but plugins currently exist only
     for ZooKeeper, etcd and consul.
-    - ZooKeeper 3.4.10 is included by default. 
+    - ZooKeeper 3.4.13 is included by default. 
     - [Install etcd v3.0+](https://github.com/coreos/etcd/releases).
       If you use etcd, remember to include the `etcd` command
       on your path.

docker/bootstrap/Dockerfile.common

@@ -1,4 +1,4 @@
-FROM golang:1.10
+FROM golang:1.11
 
 # Install Vitess build dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

docker/bootstrap/Dockerfile.mysql56

@@ -1,7 +1,7 @@
 FROM vitess/bootstrap:common
 
 # Install MySQL 5.6
-RUN for i in $(seq 1 10); do apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net 5072E1F5 && break; done && \
+RUN for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver pool.sks-keyservers.net 5072E1F5 && break; done && \
     add-apt-repository 'deb http://repo.mysql.com/apt/debian/ stretch mysql-5.6' && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server libmysqlclient-dev && \

docker/bootstrap/Dockerfile.mysql57

@@ -1,7 +1,7 @@
 FROM vitess/bootstrap:common
 
 # Install MySQL 5.7
-RUN for i in $(seq 1 10); do apt-key adv --recv-keys --keyserver ha.pool.sks-keyservers.net 5072E1F5 && break; done && \
+RUN for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver ha.pool.sks-keyservers.net 5072E1F5 && break; done && \
     add-apt-repository 'deb http://repo.mysql.com/apt/debian/ stretch mysql-5.7' && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server libmysqlclient-dev && \

docker/bootstrap/Dockerfile.percona

@@ -1,7 +1,7 @@
 FROM vitess/bootstrap:common
 
 # Install Percona 5.6
-RUN for i in $(seq 1 10); do apt-key adv --keyserver keys.gnupg.net --recv-keys 8507EFA5 && break; done && \
+RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keys.gnupg.net --recv-keys 8507EFA5 && break; done && \
     add-apt-repository 'deb http://repo.percona.com/apt stretch main' && \
     { \
         echo debconf debconf/frontend select Noninteractive; \

docker/bootstrap/Dockerfile.percona57

@@ -1,7 +1,7 @@
 FROM vitess/bootstrap:common
 
 # Install Percona 5.7
-RUN for i in $(seq 1 10); do apt-key adv --keyserver keys.gnupg.net --recv-keys 8507EFA5 && break; done && \
+RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keys.gnupg.net --recv-keys 8507EFA5 && break; done && \
     add-apt-repository 'deb http://repo.percona.com/apt stretch main' && \
     { \
         echo debconf debconf/frontend select Noninteractive; \

docker/lite/Dockerfile.alpine

@@ -4,8 +4,8 @@ FROM alpine:3.8 AS staging
 
 RUN mkdir -p /vt/vtdataroot/ && mkdir -p /vt/bin && mkdir -p /vt/src/vitess.io/vitess/web/vtctld2
 
-COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld /vt/src/vitess.io/web/
-COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld2/app /vt/src/vitess.io/web/vtctld2/
+COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld /vt/src/vitess.io/web/vtctld
+COPY --from=builder /vt/src/vitess.io/vitess/web/vtctld2/app /vt/src/vitess.io/web/vtctld2/app
 COPY --from=builder /vt/src/vitess.io/vitess/config /vt/config
 COPY --from=builder /vt/bin/mysqlctld /vt/bin/
 COPY --from=builder /vt/bin/vtctld /vt/bin/

docker/test/run.sh

@@ -204,9 +204,9 @@ fi
 # Clean up host dir mounted VTDATAROOT
 if [[ -n "$hostdir" ]]; then
   # Use Docker user to clean up first, to avoid permission errors.
-  docker run --name=rm_$testid -v $hostdir:/vt/vtdataroot $image bash -c 'rm -rf /vt/vtdataroot/*'
+  #docker run --name=rm_$testid -v $hostdir:/vt/vtdataroot $image bash -c 'rm -rf /vt/vtdataroot/*'
   docker rm -f rm_$testid &>/dev/null
-  rm -rf $hostdir
+  #rm -rf $hostdir
 fi
 
 # If requested, create the cache image.