Merge pull request #4 from vitessio/master

vitessio · Mar 31, 2020 · b85e930 · b85e930
2 parents c54d960 + 5bf7310
commit b85e930
Show file tree

Hide file tree

Showing 193 changed files with 4,589 additions and 18,064 deletions.
diff --git a/.github/workflows/cluster_endtoend.yml b/.github/workflows/cluster_endtoend.yml
@@ -40,6 +40,7 @@ jobs:
         fi
 
     - name: sharded cluster_endtoend
+      timeout-minutes: 30
       run: |
         source build.env
         eatmydata -- go run test.go -docker=false -print-log -follow -shard ${{matrix.name}}

diff --git a/.github/workflows/e2e_race.yml b/.github/workflows/e2e_race.yml
@@ -30,5 +30,6 @@ jobs:
         make minimaltools
 
     - name: e2e_race
+      timeout-minutes: 30
       run: |
         make e2e_test_race
diff --git a/.github/workflows/endtoend.yml b/.github/workflows/endtoend.yml
@@ -34,5 +34,6 @@ jobs:
         make build
 
     - name: endtoend
+      timeout-minutes: 30
       run: |
         tools/e2e_test_runner.sh
diff --git a/.github/workflows/local_example.yml b/.github/workflows/local_example.yml
@@ -43,6 +43,7 @@ jobs:
         make build
 
     - name: local_example
+      timeout-minutes: 30
       run: |
         export TOPO=${{matrix.topo}}
         if [ ${{matrix.os}} = "macos-latest" ]; then

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -85,5 +85,6 @@ jobs:
         make tools
 
     - name: unit
+      timeout-minutes: 30
       run: |
         eatmydata -- make unit_test
diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml
@@ -34,5 +34,6 @@ jobs:
         make tools
 
     - name: unit_race
+      timeout-minutes: 30
       run: |
         eatmydata -- make unit_test_race
diff --git a/go/cmd/vtgate/status.go b/go/cmd/vtgate/status.go
@@ -22,7 +22,6 @@ import (
 	"vitess.io/vitess/go/vt/srvtopo"
 	_ "vitess.io/vitess/go/vt/status"
 	"vitess.io/vitess/go/vt/vtgate"
-	"vitess.io/vitess/go/vt/vtgate/gateway"
 )
 
 // For use by plugins which wish to avoid racing when registering status page parts.
@@ -39,7 +38,7 @@ func addStatusParts(vtg *vtgate.VTGate) {
 	servenv.AddStatusPart("Topology Cache", srvtopo.TopoTemplate, func() interface{} {
 		return resilientServer.CacheStatus()
 	})
-	servenv.AddStatusPart("Gateway Status", gateway.StatusTemplate, func() interface{} {
+	servenv.AddStatusPart("Gateway Status", vtgate.StatusTemplate, func() interface{} {
 		return vtg.GetGatewayCacheStatus()
 	})
 	servenv.AddStatusPart("Health Check Cache", discovery.HealthCheckTemplate, func() interface{} {

diff --git a/go/cmd/vtgate/vtgate.go b/go/cmd/vtgate/vtgate.go
@@ -47,8 +47,6 @@ var (
 var resilientServer *srvtopo.ResilientServer
 var healthCheck discovery.HealthCheck
 
-var initFakeZK func()
-
 func init() {
 	rand.Seed(time.Now().UnixNano())
 	servenv.RegisterDefaultFlags()
@@ -60,9 +58,6 @@ func main() {
 	servenv.ParseFlags("vtgate")
 	servenv.Init()
 
-	if initFakeZK != nil {
-		initFakeZK()
-	}
 	ts := topo.Open()
 	defer ts.Close()
 

diff --git a/go/cmd/vtgateclienttest/goclienttest/callerid.go b/go/cmd/vtgateclienttest/goclienttest/callerid.go