tinyspeck · setassociative · Mar 16, 2021 · Sep 23, 2020 · Sep 23, 2020 · Sep 23, 2020
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -4,3 +4,17 @@
 /helm/ @derekperkins @dkhenry
 /config/mycnf/ @morgo
 /go/vt/mysqlctl/mysqld.go @morgo
+/go/test/endtoend/vtgate @harshit-gangal @systay
+/go/vt/vtgate @harshit-gangal @systay
+/go/vt/vttablet/tabletserver @harshit-gangal @systay
+/go/vt/vttablet/tabletmanager/vstreamer @rohit-nayak-ps
+/go/vt/sqlparser @harshit-gangal @systay
+/go/vt/discovery @deepthi
+/go/vt/vttablet/tabletmanager @deepthi
+/go/vt/vttablet/tabletmanager/vreplication @rohit-nayak-ps
+/go/vt/orchestrator @deepthi
+/go/vt/vtctl @deepthi
+/go/vt/wrangler @deepthi @rohit-nayak-ps
+/go/vt/mysqlctl @deepthi
+/web/vtctld2 @rohit-nayak-ps
+/examples/local @rohit-nayak-ps
diff --git a/.github/workflows/cluster_endtoend.yml b/.github/workflows/cluster_endtoend.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        name: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24]
+        name: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27]
 
     steps:
     - name: Set up Go

diff --git a/.github/workflows/docker_test_1.yml b/.github/workflows/docker_test_1.yml
@@ -16,6 +16,6 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v2
 
-    - name: Run tests which requires docker 1
+    - name: Run tests which require docker - 1
       run: |
         go run test.go -docker=true --follow -shard 10
diff --git a/.github/workflows/docker_test_2.yml b/.github/workflows/docker_test_2.yml
@@ -1,4 +1,4 @@
-name: docker test 2
+name: docker_test_2
 on: [push, pull_request]
 jobs:
 
@@ -16,6 +16,6 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v2
 
-    - name: Run tests which requires docker - 2
+    - name: Run tests which require docker - 2
       run: |
         go run test.go -docker=true --follow -shard 25
diff --git a/.github/workflows/docker_test_3.yml b/.github/workflows/docker_test_3.yml
@@ -0,0 +1,21 @@
+name: docker_test_3
+on: [push, pull_request]
+jobs:
+
+  build:
+    name: Docker Test 3
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Set up Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.13
+
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Run tests which require docker - 3
+      run: |
+        go run test.go -docker=true --follow -shard 26
diff --git a/.github/workflows/region_example.yml b/.github/workflows/region_example.yml
@@ -51,5 +51,5 @@ jobs:
         fi
         # Make sure that testing is entirely non-reliant on config
         mv config config-moved
-        sed -i 's/user\/my-vitess/runner\/work\/vitess\/vitess/g' examples/region_sharding/main_vschema.json #set correct path to countries.json
+        sed -i 's/user\/my-vitess/runner\/work\/vitess\/vitess/g' examples/region_sharding/main_vschema_sharded.json #set correct path to countries.json
         eatmydata -- test/region_example.sh
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -2,6 +2,7 @@ This page lists all active maintainers and their areas of expertise. This can be
 
 The following is the full list, alphabetically ordered.
 
+* Alkin Tezuysal ([askdba](https://github.com/askdba)) alkin@planetscale.com
 * Andres Taylor ([systay](https://github.com/systay)) andres@planetscale.com
 * Anthony Yeh ([enisoc](https://github.com/enisoc)) enisoc@planetscale.com
 * Dan Kozlowski ([dkhenry](https://github.com/dkhenry)) koz@planetscale.com
@@ -15,6 +16,7 @@ The following is the full list, alphabetically ordered.
 * Morgan Tocker ([morgo](https://github.com/morgo)) morgan@planetscale.com
 * Paul Hemberger ([pH14](https://github.com/pH14)) phemberger@hubspot.com
 * Rafael Chacon ([rafael](https://github.com/rafael)) rchacon@slack-corp.com
+* Shlomi Noach ([shlomi-noach](https://github.com/shlomi-noach)) shlomi@planetscale.com
 * Sugu Sougoumarane ([sougou](https://github.com/sougou)) sougou@planetscale.com
 
 ## Areas of expertise
@@ -29,10 +31,10 @@ dkhenry, morgo
 sougou, rafael, tirsen, dweitzman, systay
 
 ### Parser
-sougou, dweitzman, deepthi, systay
+sougou, dweitzman, deepthi, systay, harshit-gangal
 
 ### Cluster Management
-deepthi, rafael, enisoc
+deepthi, rafael, enisoc, shlomi-noach
 
 ### Java
 mpawliszyn, pH14, harshit-gangal

diff --git a/Makefile b/Makefile
@@ -37,6 +37,13 @@ ifdef VT_EXTRA_BUILD_FLAGS
 export EXTRA_BUILD_FLAGS := $(VT_EXTRA_BUILD_FLAGS)
 endif
 
+# We now have CGO code in the build which throws warnings with newer gcc builds.
+# See: https://github.com/mattn/go-sqlite3/issues/803
+# Work around by dropping optimization level from default -O2.
+# Safe, since this code isn't performance critical.
+export CGO_CFLAGS := -O1
+
+# regenerate rice-box.go when any of the .cnf files change
 embed_config:
 	cd go/vt/mysqlctl
 	go run github.com/GeertJohan/go.rice/rice embed-go
@@ -47,7 +54,8 @@ ifndef NOBANNER
 	echo $$(date): Building source tree
 endif
 	bash ./build.env
-	go install $(EXTRA_BUILD_FLAGS) $(VT_GO_PARALLEL) -ldflags "$(shell tools/build_version_flags.sh)" ./go/...
+	go install $(EXTRA_BUILD_FLAGS) $(VT_GO_PARALLEL) -ldflags "$(shell tools/build_version_flags.sh)" ./go/... && \
+		(cd go/cmd/vttablet && go run github.com/GeertJohan/go.rice/rice append --exec=../../../bin/vttablet)
 
 debug:
 ifndef NOBANNER
@@ -61,7 +69,7 @@ endif
 install: build
 	# binaries
 	mkdir -p "$${PREFIX}/bin"
-	cp "$${VTROOT}/bin/"{mysqlctld,vtctld,vtctlclient,vtgate,vttablet,vtworker,vtbackup} "$${PREFIX}/bin/"
+	cp "$${VTROOT}/bin/"{mysqlctld,vtorc,vtctld,vtctlclient,vtgate,vttablet,vtworker,vtbackup} "$${PREFIX}/bin/"
 
 # install copies the files needed to run test Vitess using vtcombo into the given directory tree.
 # Usage: make install PREFIX=/path/to/install/root
@@ -155,14 +163,13 @@ ifndef NOBANNER
 	echo $$(date): Compiling proto definitions
 endif
 
-# TODO(sougou): find a better way around this temp hack.
-VTTOP=$(VTROOT)/../../..
 $(PROTO_GO_OUTS): install_protoc-gen-go proto/*.proto
 	for name in $(PROTO_SRC_NAMES); do \
-		cd $(VTTOP)/src && \
-		$(VTROOT)/bin/protoc --go_out=plugins=grpc:. -Ivitess.io/vitess/proto vitess.io/vitess/proto/$${name}.proto && \
-		goimports -w $(VTROOT)/go/vt/proto/$${name}/$${name}.pb.go; \
+		$(VTROOT)/bin/protoc --go_out=plugins=grpc:. -Iproto proto/$${name}.proto && \
+		goimports -w vitess.io/vitess/go/vt/proto/$${name}/$${name}.pb.go; \
 	done
+	cp -Rf vitess.io/vitess/go/vt/proto/* go/vt/proto
+	rm -rf vitess.io/vitess/go/vt/proto/
 
 # Helper targets for building Docker images.
 # Please read docker/README.md to understand the different available images.

diff --git a/bootstrap.sh b/bootstrap.sh
@@ -119,7 +119,7 @@ function install_zookeeper() {
   local dist="$2"
 
   zk="zookeeper-$version"
-  wget "https://apache.org/dist/zookeeper/$zk/$zk.tar.gz"
+  wget "https://archive.apache.org/dist/zookeeper/$zk/$zk.tar.gz"
   tar -xzf "$zk.tar.gz"
   ant -f "$zk/build.xml" package
   ant -f "$zk/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml" jar

diff --git a/config/mycnf/default-fast.cnf b/config/mycnf/default-fast.cnf
@@ -20,3 +20,6 @@ innodb_doublewrite=0
 # https://github.com/vitessio/vitess/issues/5396
 
 sql_mode = STRICT_TRANS_TABLES
+
+# set a short heartbeat interval in order to detect failures quickly
+slave_net_timeout = 4
diff --git a/config/orchestrator/default.json b/config/orchestrator/default.json
@@ -0,0 +1,8 @@
+{
+  "Debug": true,
+  "MySQLTopologyUser": "orc_client_user",
+  "MySQLTopologyPassword": "orc_client_user_password",
+  "MySQLReplicaUser": "vt_repl",
+  "MySQLReplicaPassword": "",
+  "RecoveryPeriodBlockSeconds": 5
+}
diff --git a/doc/TwoPhaseCommitDesign.md b/doc/TwoPhaseCommitDesign.md
@@ -142,7 +142,7 @@ The detailed design explains all the functionalities and interactions.
 
 Currently, transaction ids are issued by VTTablets (VTID), and those ids are considered local. In order to coordinate distributed transactions, a new system is needed to identify and track them. This is needed mainly so that the watchdog process can pick up an orphaned transaction and resolve it to completion.
 
-The DTID will be generated by taking the VTID of the MM and prefixing it with the keyspace, shard info and a sequence to prevent to prevent collisions. If the MM’s VTID was ‘1234’ for keyspace ‘order’ and shard ‘40-80’, then the DTID would be ‘order:40-80:1234’. A collision could still happen if there is a failover and the new vttablet’s starting VTID had overlaps with the previous instance. To prevent this, the starting VTID of the vttablet will be adjusted to a value higher than any used by the prepared GTIDs.
+The DTID will be generated by taking the VTID of the MM and prefixing it with the keyspace, shard info and a sequence to prevent collisions. If the MM’s VTID was ‘1234’ for keyspace ‘order’ and shard ‘40-80’, then the DTID would be ‘order:40-80:1234’. A collision could still happen if there is a failover and the new vttablet’s starting VTID had overlaps with the previous instance. To prevent this, the starting VTID of the vttablet will be adjusted to a value higher than any used by the prepared GTIDs.
 
 ## Prepare API