Merge remote-tracking branch 'upstream/master' into horizon-planning

Signed-off-by: Andres Taylor <[email protected]>

MAINTAINERS.md

@@ -5,15 +5,14 @@ The following is the full list, alphabetically ordered.
 * Alkin Tezuysal ([askdba](https://github.com/askdba)) [email protected]
 * Andres Taylor ([systay](https://github.com/systay)) [email protected]
 * Anthony Yeh ([enisoc](https://github.com/enisoc)) [email protected]
-* Dan Kozlowski ([dkhenry](https://github.com/dkhenry)) koz@planetscale.com
+* Dan Kozlowski ([dkhenry](https://github.com/dkhenry)) dan.kozlowski@gmail.com
 * David Weitzman ([dweitzman](https://github.com/dweitzman)) [email protected]
 * Deepthi Sigireddi ([deepthi](https://github.com/deepthi)) [email protected]
 * Derek Perkins ([derekperkins](https://github.com/derekperkins)) [email protected]
 * Harshit Gangal ([harshit-gangal](https://github.com/harshit-gangal)) [email protected]
 * Jon Tirsen ([tirsen](https://github.com/tirsen)) [email protected]
 * Michael Demmer ([demmer](https://github.com/demmer)) [email protected]
 * Michael Pawliszyn ([mpawliszyn](https://github.com/mpawliszyn)) [email protected]
-* Morgan Tocker ([morgo](https://github.com/morgo)) [email protected]
 * Paul Hemberger ([pH14](https://github.com/pH14)) [email protected]
 * Rafael Chacon ([rafael](https://github.com/rafael)) [email protected]
 * Rohit Nayak ([rohit-nayak-ps](https://github.com/rohit-nayak-ps)) [email protected]
@@ -23,13 +22,13 @@ The following is the full list, alphabetically ordered.
 ## Areas of expertise
 
 ### General Vitess
-sougou, demmer, rafael, dweitzman, tirsen, morgo, enisoc
+sougou, demmer, rafael, dweitzman, tirsen, askdba, enisoc
 
 ### Builds
-dkhenry, morgo
+dkhenry, shlomi-noach
 
 ### Resharding
-sougou, rafael, tirsen, dweitzman, systay
+sougou, rafael, tirsen, dweitzman, systay, rohit-nayak-ps
 
 ### Parser
 sougou, dweitzman, deepthi, systay, harshit-gangal

examples/compose/README.md

@@ -280,6 +280,13 @@ To run against a specific compose service/container, use the environment variabl
 vitess/examples/compose$ (export CS=vttablet101; ./lvtctl.sh <args> )
 ```
 
+## Custom Image Tags
+You  may specify a custom `vitess:lite` image tag by setting the evnironment variable `VITESS_TAG`.  
+This is optional and defaults to the `latest` tag. Example;
+* Set `VITESS_TAG=8.0.0` in your `.env` before running `docker-compose up -d`
+* Run `VITESS_TAG=8.0.0; docker-compose up -d`
+
+
 ## Reference
 Checkout this excellent post about [The Life of a Vitess Cluster](https://vitess.io/blog/2020-04-27-life-of-a-cluster/)
 

examples/compose/docker-compose.beginners.yml

@@ -58,7 +58,7 @@ services:
       - "3306"
 
   vtctld:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     ports:
       - "15000:$WEB_PORT"
       - "$GRPC_PORT"
@@ -83,7 +83,7 @@ services:
         condition: service_healthy
 
   vtgate:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     ports:
       - "15099:$WEB_PORT"
       - "$GRPC_PORT"
@@ -113,7 +113,7 @@ services:
         condition: service_healthy
 
   schemaload:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     command:
     - sh
     - -c
@@ -137,7 +137,7 @@ services:
         condition: service_healthy
 
   vttablet100:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     ports:
       - "15100:$WEB_PORT"
       - "$GRPC_PORT"
@@ -169,7 +169,7 @@ services:
       retries: 15
 
   vttablet101:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     ports:
       - "15101:$WEB_PORT"
       - "$GRPC_PORT"
@@ -201,7 +201,7 @@ services:
       retries: 15
 
   vttablet102:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     ports:
       - "15102:$WEB_PORT"
       - "$GRPC_PORT"
@@ -233,7 +233,7 @@ services:
       retries: 15
 
   vttablet103:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     ports:
       - "15103:$WEB_PORT"
       - "$GRPC_PORT"
@@ -265,7 +265,7 @@ services:
       retries: 15
 
   vtorc:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     command: ["sh", "-c", "/script/vtorc-up.sh"]
     depends_on:
       - vtctld
@@ -293,7 +293,7 @@ services:
       retries: 15
 
   vreplication:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     volumes:
       - ".:/script"
     environment:

examples/compose/tablet.yml

@@ -0,0 +1,24 @@
+externalConnections:
+  erpl:
+    flavor: FilePos
+    host: external_db_host
+    port: 3306
+    dbName: commerce
+    app:
+      user: external_db_user
+      password: external_db_password
+    dba:
+      user: external_db_user
+      password: external_db_password
+    filtered:
+      user: external_db_user
+      password: external_db_password
+    repl:
+      user: external_db_user
+      password: external_db_password
+    appdebug:
+      user: external_db_user
+      password: external_db_password
+    allprivs:
+      user: external_db_user
+      password: external_db_password

examples/compose/vtcompose/vtcompose.go

@@ -532,7 +532,7 @@ func generateDefaultShard(tabAlias int, shard string, keyspaceData keyspaceInfo,
 - op: add
   path: /services/init_shard_master%[2]d
   value:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     command: ["sh", "-c", "/vt/bin/vtctlclient %[5]s InitShardMaster -force %[4]s/%[3]s %[6]s-%[2]d "]
     %[1]s
 `, dependsOn, aliases[0], shard, keyspaceData.keyspace, opts.topologyFlags, opts.cell)
@@ -564,7 +564,7 @@ func generateExternalmaster(
 - op: add
   path: /services/vttablet%[1]d
   value:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     ports:
       - "15%[1]d:%[3]d"
       - "%[4]d"
@@ -626,7 +626,7 @@ func generateDefaultTablet(tabAlias int, shard, role, keyspace string, dbInfo ex
 - op: add
   path: /services/vttablet%[1]d
   value:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     ports:
     - "15%[1]d:%[4]d"
     - "%[5]d"
@@ -664,7 +664,7 @@ func generateVtctld(opts vtOptions) string {
 - op: add
   path: /services/vtctld
   value:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     ports:
       - "15000:%[1]d"
       - "%[2]d"
@@ -697,7 +697,7 @@ func generateVtgate(opts vtOptions) string {
 - op: add
   path: /services/vtgate
   value:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     ports:
       - "15099:%[1]d"
       - "%[2]d"
@@ -727,7 +727,7 @@ func generateVtwork(opts vtOptions) string {
 - op: add
   path: /services/vtwork
   value:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     ports:
       - "%[1]d"
       - "%[2]d"
@@ -754,7 +754,7 @@ func generateVtorc(dbInfo externalDbInfo, opts vtOptions) string {
 - op: add
   path: /services/vtorc
   value:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     volumes:
       - ".:/script"
     environment:
@@ -779,7 +779,7 @@ func generateVreplication(dbInfo externalDbInfo, opts vtOptions) string {
 - op: add
   path: /services/vreplication
   value:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     volumes:
       - ".:/script"
     environment:
@@ -817,7 +817,7 @@ func generateSchemaload(
 - op: add
   path: /services/schemaload_%[7]s
   value:
-    image: vitess/lite
+    image: vitess/lite:${VITESS_TAG:-latest}
     volumes:
       - ".:/script"
     environment:

examples/compose/vttablet-up.sh

@@ -130,7 +130,6 @@ if [ $tablet_role = "externalmaster" ]; then
                       -db_filtered_password $DB_PASS \
                       -db_repl_user $DB_USER \
                       -db_repl_password $DB_PASS \
-                      -init_populate_metadata=true \
                       -enable_replication_reporter=false \
                       -enforce_strict_trans_tables=false \
                       -track_schema_versions=true \

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/Azure/azure-storage-blob-go v0.10.0
 	github.com/Azure/go-autorest/autorest v0.10.0
 	github.com/Azure/go-autorest/autorest/validation v0.3.0 // indirect
+	github.com/DataDog/datadog-go v2.2.0+incompatible
 	github.com/GeertJohan/go.rice v1.0.0
 	github.com/PuerkitoBio/goquery v1.5.1
 	github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6

go/cmd/vtgate/plugin_statsd.go

@@ -0,0 +1,7 @@
+package main
+
+import "vitess.io/vitess/go/stats/statsd"
+
+func init() {
+	statsd.Init("vtgate")
+}

go/cmd/vttablet/plugin_statsd.go

@@ -0,0 +1,7 @@
+package main
+
+import "vitess.io/vitess/go/stats/statsd"
+
+func init() {
+	statsd.Init("vttablet")
+}

go/mysql/binlog_event.go

@@ -128,24 +128,24 @@ type BinlogEvent interface {
 // This structure is passed to subsequent event types to let them know how to
 // parse themselves.
 type BinlogFormat struct {
-	// FormatVersion is the version number of the binlog file format.
-	// We only support version 4.
-	FormatVersion uint16
+	// HeaderSizes is an array of sizes of the headers for each message.
+	HeaderSizes []byte
 
 	// ServerVersion is the name of the MySQL server version.
 	// It starts with something like 5.6.33-xxxx.
 	ServerVersion string
 
+	// FormatVersion is the version number of the binlog file format.
+	// We only support version 4.
+	FormatVersion uint16
+
 	// HeaderLength is the size in bytes of event headers other
 	// than FORMAT_DESCRIPTION_EVENT. Almost always 19.
 	HeaderLength byte
 
 	// ChecksumAlgorithm is the ID number of the binlog checksum algorithm.
 	// See three possible values below.
 	ChecksumAlgorithm byte
-
-	// HeaderSizes is an array of sizes of the headers for each message.
-	HeaderSizes []byte
 }
 
 // IsZero returns true if the BinlogFormat has not been initialized.