diff --git a/Makefile b/Makefile index cf693d775b..e0a1b0b7ba 100644 --- a/Makefile +++ b/Makefile @@ -164,7 +164,7 @@ docker_bootstrap_test: flavors='$(DOCKER_IMAGES_FOR_TEST)' && ./test.go -pull=false -parallel=2 -flavor=$${flavors// /,} docker_bootstrap_push: - for i in $(DOCKER_IMAGES); do echo "pushing boostrap image: $$i"; docker push vitess/bootstrap:$$i || exit 1; done + for i in $(DOCKER_IMAGES); do echo "pushing bootstrap image: $$i"; docker push vitess/bootstrap:$$i || exit 1; done # Use this target to update the local copy of your images with the one on Dockerhub. docker_bootstrap_pull: diff --git a/go.mod b/go.mod index 65d441910d..dc18e95444 100644 --- a/go.mod +++ b/go.mod @@ -16,16 +16,14 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/ghodss/yaml v0.0.0-20161207003320-04f313413ffd // indirect github.com/go-ini/ini v1.12.0 // indirect - github.com/gogo/protobuf v1.2.1 // indirect github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect github.com/golang/mock v1.3.1 github.com/golang/protobuf v1.3.2 github.com/golang/snappy v0.0.0-20170215233205-553a64147049 - github.com/google/btree v1.0.0 // indirect github.com/gorilla/websocket v0.0.0-20160912153041-2d1e4548da23 - github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190118093823-f849b5445de4 - github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20180418170936-39de4380c2e0 + github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/grpc-ecosystem/grpc-gateway v0.0.0-20161128002007-199c40a060d1 // indirect github.com/hashicorp/consul v1.4.0 github.com/hashicorp/go-msgpack v0.5.5 // indirect @@ -49,29 +47,32 @@ require ( github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02 github.com/opentracing/opentracing-go v1.1.0 github.com/pborman/uuid v0.0.0-20160824210600-b984ec7fa9ff - github.com/prometheus/client_golang v0.9.2 + github.com/prometheus/client_golang v1.1.0 + github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect + github.com/prometheus/common v0.7.0 // indirect + github.com/prometheus/procfs v0.0.5 // indirect github.com/satori/go.uuid v0.0.0-20160713180306-0aa62d5ddceb // indirect github.com/stretchr/testify v1.4.0 github.com/tchap/go-patricia v0.0.0-20160729071656-dd168db6051b github.com/uber-go/atomic v1.4.0 // indirect github.com/uber/jaeger-client-go v2.16.0+incompatible github.com/uber/jaeger-lib v2.0.0+incompatible // indirect - github.com/ugorji/go v1.1.7 // indirect + github.com/ugorji/go/codec v1.1.7 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect github.com/z-division/go-zookeeper v0.0.0-20190128072838-6d7457066b9b - go.uber.org/atomic v1.4.0 // indirect golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 golang.org/x/lint v0.0.0-20190409202823-959b441ac422 - golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 + golang.org/x/net v0.0.0-20190926025831-c00fd9afed17 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 - golang.org/x/sys v0.0.0-20190830142957-1e83adbbebd0 // indirect + golang.org/x/sys v0.0.0-20190926180325-855e68c8590b // indirect golang.org/x/text v0.3.2 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 golang.org/x/tools v0.0.0-20190830154057-c17b040389b9 google.golang.org/api v0.9.0 - google.golang.org/grpc v1.21.1 + google.golang.org/genproto v0.0.0-20190926190326-7ee9db18f195 // indirect + google.golang.org/grpc v1.24.0 gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175 // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/ldap.v2 v2.5.0 - honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a + honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc ) diff --git a/go.sum b/go.sum index 18f9354094..f294cf0ff6 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.43.0 h1:banaiRPAM8kUVYneOSkhgcDsLzEvL25FinuiSZaH/2w= -cloud.google.com/go v0.43.0/go.mod h1:BOSR3VbTLkk6FDC/TcffxP4NF/FFBGA5ku+jvKOP7pg= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1 h1:lRi0CHyU+ytlvylOlFKKq0af6JncuyoRh1J+QJBqQx0= @@ -13,6 +11,10 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 h1:EFSB7Zo9Eg91v7MJPVsifUysc/wPdN+NOnVe6bWbdBM= github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod h1:3AMJUQhVx52RsWOnlkpikZr01T/yAVN2gn0861vByNg= @@ -20,6 +22,9 @@ github.com/aws/aws-sdk-go v0.0.0-20180223184012-ebef4262e06a h1:Ed33uJE74ksDaYfd github.com/aws/aws-sdk-go v0.0.0-20180223184012-ebef4262e06a/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= @@ -46,6 +51,12 @@ github.com/ghodss/yaml v0.0.0-20161207003320-04f313413ffd h1:U3yHrYB7NWH2o3UFzJ1 github.com/ghodss/yaml v0.0.0-20161207003320-04f313413ffd/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-ini/ini v1.12.0 h1:K324HQuOp7fYRWIW84d39Y7MqlH/0JU9fImSXUJ2TWk= github.com/go-ini/ini v1.12.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= @@ -68,6 +79,7 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -79,10 +91,10 @@ github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v0.0.0-20160912153041-2d1e4548da23 h1:NqeYYy/q+eU5bXzLrVTFSEMp5/VFwp3eJ6nkDsi7wos= github.com/gorilla/websocket v0.0.0-20160912153041-2d1e4548da23/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190118093823-f849b5445de4 h1:Wx79jmadGrMPEWZHn8Rogt6aMcpwbHMoO3MeehDJAGs= -github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20180418170936-39de4380c2e0 h1:6kldmIygVGmNHiCpXorySJ3/iICRLC20KBy2h1OzCUw= -github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20180418170936-39de4380c2e0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 h1:THDBEeQ9xZ8JEaCLyLQqXMMdRqNr0QAUJTIkQAUtFjg= +github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v0.0.0-20161128002007-199c40a060d1 h1:HpW72214zD3cWQsV9DW4Sd9piuuw8rPmE4/TAjTgYIE= github.com/grpc-ecosystem/grpc-gateway v0.0.0-20161128002007-199c40a060d1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/hashicorp/consul v1.4.0 h1:PQTW4xCuAExEiSbhrsFsikzbW5gVBoi74BjUvYFyKHw= @@ -118,9 +130,12 @@ github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Ao github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v0.0.0-20180801095237-b50017755d44 h1:uDhun+KVSncSm1UeN8A4llsQ6E+xAIBmhh816Q2zeOk= @@ -131,6 +146,8 @@ github.com/klauspost/crc32 v1.2.0 h1:0VuyqOCruD33/lJ/ojXNvzVyl8Zr5zdTmj9l9qLZ86I github.com/klauspost/crc32 v1.2.0/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.2.0 h1:SPtjjC68wy5g65KwQS4TcYtm6x/O8H4jSxtKZfhN4s0= github.com/klauspost/pgzip v1.2.0/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -150,6 +167,11 @@ github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdI github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/olekukonko/tablewriter v0.0.0-20160115111002-cca8bbc07984 h1:c9gVtoY8wPlhJIN2V2I1V+Fn9UcXM8mDG8IHv/1c3r8= github.com/olekukonko/tablewriter v0.0.0-20160115111002-cca8bbc07984/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02 h1:0R5mDLI66Qw13qN80TRz85zthQ2nf2+uDyiV23w6c3Q= @@ -161,28 +183,48 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v0.0.0-20160824210600-b984ec7fa9ff h1:pTiDfW+iOjIxjZeCm88gKn/AmR09UGZYZdqif2yPRrM= github.com/pborman/uuid v0.0.0-20160824210600-b984ec7fa9ff/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.1.0 h1:BQ53HtBmfOitExawJ6LokA4x8ov/z0SYYb0+HxJfRI8= +github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8= github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= +github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8= +github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/satori/go.uuid v0.0.0-20160713180306-0aa62d5ddceb h1:1r/p6yT1FfHR1+qBm7UYBPgfqCmzz/8mpNvfc+iKlfU= github.com/satori/go.uuid v0.0.0-20160713180306-0aa62d5ddceb/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY= github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= @@ -209,6 +251,9 @@ go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190128193316-c7b33c32a30b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -228,6 +273,7 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -237,9 +283,10 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190926025831-c00fd9afed17 h1:qPnAdmjNA41t3QBTx2mFGf/SD1IoslhYu7AmdsVzCcs= +golang.org/x/net v0.0.0-20190926025831-c00fd9afed17/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= @@ -251,17 +298,21 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190830142957-1e83adbbebd0 h1:7z820YPX9pxWR59qM7BE5+fglp4D/mKqAwCvGt11b+8= -golang.org/x/sys v0.0.0-20190830142957-1e83adbbebd0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190926180325-855e68c8590b h1:/8GN4qrAmRZQXgjWZHj9z/UJI5vNqQhPtgcw02z2f+8= +golang.org/x/sys v0.0.0-20190926180325-855e68c8590b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= @@ -278,6 +329,7 @@ golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190830154057-c17b040389b9 h1:5/jaG/gKlo3xxvUn85ReNyTlN7BvlPPsxC6sHZKjGEE= @@ -299,15 +351,19 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 h1:iKtrH9Y8mcbADOP0YFaEMth7OfuHY9xHOwNj4znpM1A= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190926190326-7ee9db18f195 h1:dWzgMaXfaHsnkRKZ1l3iJLDmTEB40JMl/dqRbJX4D/o= +google.golang.org/genproto v0.0.0-20190926190326-7ee9db18f195/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.24.0 h1:vb/1TCsVn3DcJlQ0Gs1yB1pKI6Do2/QNwxdKqmc/b0s= +google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175 h1:nn6Zav2sOQHCFJHEspya8KqxhFwKci30UxHy3HXPTyQ= gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -317,10 +373,13 @@ gopkg.in/ini.v1 v1.41.0 h1:Ka3ViY6gNYSKiVy71zXBEqKplnV35ImDLVG+8uoIklE= gopkg.in/ini.v1 v1.41.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ldap.v2 v2.5.0 h1:1rO3ojzsHUk+gq4ZYhC4Pg+EzWaaKIV8+DJwExS5/QQ= gopkg.in/ldap.v2 v2.5.0/go.mod h1:oI0cpe/D7HRtBQl8aTg+ZmzFUAvu4lsv3eLXMLGFxWk= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a h1:LJwr7TCTghdatWv40WobzlKXc9c4s8oGa7QKJUtHhWA= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/go/bucketpool/bucketpool_test.go b/go/bucketpool/bucketpool_test.go index 26084e95f2..3d74c3f94c 100644 --- a/go/bucketpool/bucketpool_test.go +++ b/go/bucketpool/bucketpool_test.go @@ -36,7 +36,7 @@ func TestPool(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 1024 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } // get from same pool, check that length is right @@ -45,7 +45,7 @@ func TestPool(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 1024 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } pool.Put(buf) @@ -55,7 +55,7 @@ func TestPool(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 1024 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } pool.Put(buf) @@ -65,7 +65,7 @@ func TestPool(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 8192 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } pool.Put(buf) @@ -75,7 +75,7 @@ func TestPool(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 16384 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } pool.Put(buf) @@ -85,7 +85,7 @@ func TestPool(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 16385 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } pool.Put(buf) } @@ -101,7 +101,7 @@ func TestPoolOneSize(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 1024 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } pool.Put(buf) @@ -110,7 +110,7 @@ func TestPoolOneSize(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 1025 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } pool.Put(buf) } @@ -126,7 +126,7 @@ func TestPoolTwoSizeNotMultiplier(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 1024 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } pool.Put(buf) @@ -135,7 +135,7 @@ func TestPoolTwoSizeNotMultiplier(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 2001 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } pool.Put(buf) } @@ -152,7 +152,7 @@ func TestPoolWeirdMaxSize(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 15000 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } pool.Put(buf) @@ -161,7 +161,7 @@ func TestPoolWeirdMaxSize(t *testing.T) { t.Fatalf("unexpected buf length: %d", len(*buf)) } if cap(*buf) != 16383 { - t.Fatalf("unexepected buf cap: %d", cap(*buf)) + t.Fatalf("unexpected buf cap: %d", cap(*buf)) } pool.Put(buf) } diff --git a/go/event/event_test.go b/go/event/event_test.go index 9230e9de9a..b4533733eb 100644 --- a/go/event/event_test.go +++ b/go/event/event_test.go @@ -80,7 +80,7 @@ func TestInterfaceListener(t *testing.T) { triggered := false AddListener(func(testInterface1) { triggered = true }) - AddListener(func(testInterface2) { t.Errorf("interface listener triggerd on non-matching type") }) + AddListener(func(testInterface2) { t.Errorf("interface listener triggered on non-matching type") }) Dispatch(testEvent1{}) if !triggered { diff --git a/go/mysql/conn.go b/go/mysql/conn.go index b8b4507be3..e8cf711294 100644 --- a/go/mysql/conn.go +++ b/go/mysql/conn.go @@ -255,7 +255,7 @@ func (c *Conn) readHeaderFrom(r io.Reader) (int, error) { // Note io.ReadFull will return two different types of errors: // 1. if the socket is already closed, and the go runtime knows it, // then ReadFull will return an error (different than EOF), - // someting like 'read: connection reset by peer'. + // something like 'read: connection reset by peer'. // 2. if the socket is not closed while we start the read, // but gets closed after the read is started, we'll get io.EOF. if _, err := io.ReadFull(r, header[:]); err != nil { diff --git a/go/mysql/doc.go b/go/mysql/doc.go index cdb5b45b4f..f7db86c421 100644 --- a/go/mysql/doc.go +++ b/go/mysql/doc.go @@ -51,7 +51,7 @@ server should ignore it anyway), and then should send a COM_INIT_DB message to set the database. -- -PLUGABLE AUTHENTICATION: +PLUGGABLE AUTHENTICATION: See https://dev.mysql.com/doc/internals/en/authentication-method-mismatch.html for more information on this. diff --git a/go/mysql/mysql56_gtid_set_test.go b/go/mysql/mysql56_gtid_set_test.go index bd0133f141..b9d0f295ba 100644 --- a/go/mysql/mysql56_gtid_set_test.go +++ b/go/mysql/mysql56_gtid_set_test.go @@ -69,7 +69,7 @@ func TestParseMysql56GTIDSet(t *testing.T) { "00010203-0405-0607-0809-0a0b0c0d0e0f:1-5:10-20": { sid1: []interval{{1, 5}, {10, 20}}, }, - // Multiple intervals, out of oder + // Multiple intervals, out of order "00010203-0405-0607-0809-0a0b0c0d0e0f:10-20:1-5": { sid1: []interval{{1, 5}, {10, 20}}, }, diff --git a/go/mysql/query_test.go b/go/mysql/query_test.go index 2d4bf7a13e..c782681646 100644 --- a/go/mysql/query_test.go +++ b/go/mysql/query_test.go @@ -268,7 +268,7 @@ func TestQueries(t *testing.T) { InsertID: 0x0102030405060708, }) - // Typicall Select with TYPE_AND_NAME. + // Typical Select with TYPE_AND_NAME. // One value is also NULL. checkQuery(t, "type and name", sConn, cConn, &sqltypes.Result{ Fields: []*querypb.Field{ @@ -294,7 +294,7 @@ func TestQueries(t *testing.T) { RowsAffected: 2, }) - // Typicall Select with TYPE_AND_NAME. + // Typical Select with TYPE_AND_NAME. // All types are represented. // One row has all NULL values. checkQuery(t, "all types", sConn, cConn, &sqltypes.Result{ @@ -397,7 +397,7 @@ func TestQueries(t *testing.T) { RowsAffected: 2, }) - // Typicall Select with TYPE_AND_NAME. + // Typical Select with TYPE_AND_NAME. // First value first column is an empty string, so it's encoded as 0. checkQuery(t, "first empty string", sConn, cConn, &sqltypes.Result{ Fields: []*querypb.Field{ @@ -417,7 +417,7 @@ func TestQueries(t *testing.T) { RowsAffected: 2, }) - // Typicall Select with TYPE_ONLY. + // Typical Select with TYPE_ONLY. checkQuery(t, "type only", sConn, cConn, &sqltypes.Result{ Fields: []*querypb.Field{ { @@ -435,7 +435,7 @@ func TestQueries(t *testing.T) { RowsAffected: 2, }) - // Typicall Select with ALL. + // Typical Select with ALL. checkQuery(t, "complete", sConn, cConn, &sqltypes.Result{ Fields: []*querypb.Field{ { diff --git a/go/vt/dbconfigs/credentials.go b/go/vt/dbconfigs/credentials.go index 3062e7a215..84724c5dc1 100644 --- a/go/vt/dbconfigs/credentials.go +++ b/go/vt/dbconfigs/credentials.go @@ -16,7 +16,7 @@ limitations under the License. package dbconfigs -// This file contains logic for a plugable credentials system. +// This file contains logic for a pluggable credentials system. // The default implementation is file based. // The flags are global, but only programs that need to access the database // link with this library, so we should be safe. diff --git a/go/vt/discovery/fake_healthcheck.go b/go/vt/discovery/fake_healthcheck.go index 345ea4a535..f4346b40f2 100644 --- a/go/vt/discovery/fake_healthcheck.go +++ b/go/vt/discovery/fake_healthcheck.go @@ -21,6 +21,7 @@ import ( "sync" "vitess.io/vitess/go/vt/topo" + "vitess.io/vitess/go/vt/topo/topoproto" "vitess.io/vitess/go/vt/vttablet/queryservice" "vitess.io/vitess/go/vt/vttablet/sandboxconn" @@ -104,6 +105,17 @@ func (fhc *FakeHealthCheck) RemoveTablet(tablet *topodatapb.Tablet) { fhc.mu.Lock() defer fhc.mu.Unlock() key := TabletToMapKey(tablet) + item, ok := fhc.items[key] + if !ok { + return + } + // Make sure the key still corresponds to the tablet we want to delete. + // If it doesn't match, we should do nothing. The tablet we were asked to + // delete is already gone, and some other tablet is using the key + // (host:port) that the original tablet used to use, which is fine. + if !topoproto.TabletAliasEqual(tablet.Alias, item.ts.Tablet.Alias) { + return + } delete(fhc.items, key) } diff --git a/go/vt/discovery/healthcheck.go b/go/vt/discovery/healthcheck.go index 2e5e527b9f..fbc322b8e1 100644 --- a/go/vt/discovery/healthcheck.go +++ b/go/vt/discovery/healthcheck.go @@ -688,6 +688,17 @@ func (hc *HealthCheckImpl) deleteConn(tablet *topodatapb.Tablet) { if !ok { return } + // Make sure the key still corresponds to the tablet we want to delete. + // If it doesn't match, we should do nothing. The tablet we were asked to + // delete is already gone, and some other tablet is using the key + // (host:port) that the original tablet used to use, which is fine. + if !topoproto.TabletAliasEqual(tablet.Alias, th.latestTabletStats.Tablet.Alias) { + return + } + hc.deleteConnLocked(key, th) +} + +func (hc *HealthCheckImpl) deleteConnLocked(key string, th *tabletHealth) { th.latestTabletStats.Up = false th.cancelFunc() delete(hc.addrToHealth, key) @@ -733,10 +744,18 @@ func (hc *HealthCheckImpl) AddTablet(tablet *topodatapb.Tablet, name string) { hc.mu.Unlock() return } - if _, ok := hc.addrToHealth[key]; ok { - hc.mu.Unlock() - log.Warningf("adding duplicate tablet %v for %v: %+v", name, tablet.Alias.Cell, tablet) - return + if th, ok := hc.addrToHealth[key]; ok { + // Something already exists at this key. + // If it's the same tablet, something is wrong. + if topoproto.TabletAliasEqual(th.latestTabletStats.Tablet.Alias, tablet.Alias) { + hc.mu.Unlock() + log.Warningf("refusing to add duplicate tablet %v for %v: %+v", name, tablet.Alias.Cell, tablet) + return + } + // If it's a different tablet, then we trust this new tablet that claims + // it has taken over the host:port that the old tablet used to be on. + // Remove the old tablet to clear the way. + hc.deleteConnLocked(key, th) } hc.addrToHealth[key] = &tabletHealth{ cancelFunc: cancelFunc, @@ -752,15 +771,13 @@ func (hc *HealthCheckImpl) AddTablet(tablet *topodatapb.Tablet, name string) { // RemoveTablet removes the tablet, and stops the health check. // It does not block. func (hc *HealthCheckImpl) RemoveTablet(tablet *topodatapb.Tablet) { - go hc.deleteConn(tablet) + hc.deleteConn(tablet) } // ReplaceTablet removes the old tablet and adds the new tablet. func (hc *HealthCheckImpl) ReplaceTablet(old, new *topodatapb.Tablet, name string) { - go func() { - hc.deleteConn(old) - hc.AddTablet(new, name) - }() + hc.deleteConn(old) + hc.AddTablet(new, name) } // WaitForInitialStatsUpdates waits until all tablets added via AddTablet() call diff --git a/go/vt/discovery/topology_watcher_test.go b/go/vt/discovery/topology_watcher_test.go index 9288cca1be..315160a594 100644 --- a/go/vt/discovery/topology_watcher_test.go +++ b/go/vt/discovery/topology_watcher_test.go @@ -234,6 +234,56 @@ func checkWatcher(t *testing.T, cellTablets, refreshKnownTablets bool) { t.Errorf("fhc.GetAllTablets() = %+v; want %v => %+v", allTablets, key, tablet2) } + // Both tablets restart on different hosts. + // tablet2 happens to land on the host:port that tablet 1 used to be on. + // This can only be tested when we refresh known tablets. + if refreshKnownTablets { + origTablet := *tablet + origTablet2 := *tablet2 + + if _, err := ts.UpdateTabletFields(context.Background(), tablet2.Alias, func(t *topodatapb.Tablet) error { + t.Hostname = tablet.Hostname + t.PortMap = tablet.PortMap + tablet2 = t + return nil + }); err != nil { + t.Fatalf("UpdateTabletFields failed: %v", err) + } + if _, err := ts.UpdateTabletFields(context.Background(), tablet.Alias, func(t *topodatapb.Tablet) error { + t.Hostname = "host3" + tablet = t + return nil + }); err != nil { + t.Fatalf("UpdateTabletFields failed: %v", err) + } + tw.loadTablets() + counts = checkOpCounts(t, tw, counts, map[string]int64{"ListTablets": 1, "GetTablet": 2, "ReplaceTablet": 2}) + allTablets = fhc.GetAllTablets() + key2 := TabletToMapKey(tablet2) + if _, ok := allTablets[key2]; !ok { + t.Fatalf("tablet was lost because it's reusing an address recently used by another tablet: %v", key2) + } + + // Change tablets back to avoid altering later tests. + if _, err := ts.UpdateTabletFields(context.Background(), tablet2.Alias, func(t *topodatapb.Tablet) error { + t.Hostname = origTablet2.Hostname + t.PortMap = origTablet2.PortMap + tablet2 = t + return nil + }); err != nil { + t.Fatalf("UpdateTabletFields failed: %v", err) + } + if _, err := ts.UpdateTabletFields(context.Background(), tablet.Alias, func(t *topodatapb.Tablet) error { + t.Hostname = origTablet.Hostname + tablet = t + return nil + }); err != nil { + t.Fatalf("UpdateTabletFields failed: %v", err) + } + tw.loadTablets() + counts = checkOpCounts(t, tw, counts, map[string]int64{"ListTablets": 1, "GetTablet": 2, "ReplaceTablet": 2}) + } + // Remove the tablet and check that it is detected as being gone. if err := ts.DeleteTablet(context.Background(), tablet.Alias); err != nil { t.Fatalf("DeleteTablet failed: %v", err) diff --git a/go/vt/key/destination.go b/go/vt/key/destination.go index ca7867fa50..c1d5797bd0 100644 --- a/go/vt/key/destination.go +++ b/go/vt/key/destination.go @@ -382,7 +382,7 @@ type DestinationAnyShardPicker interface { // DestinationAnyShardPickerRandomShard picks a random shard. type DestinationAnyShardPickerRandomShard struct{} -// PickShard is DestinationAnyShardPickerRandomShard's implmentation. +// PickShard is DestinationAnyShardPickerRandomShard's implementation. func (dp DestinationAnyShardPickerRandomShard) PickShard(shardCount int) int { return rand.Intn(shardCount) } diff --git a/go/vt/mysqlctl/backup.go b/go/vt/mysqlctl/backup.go index 324f61c344..41ebc86118 100644 --- a/go/vt/mysqlctl/backup.go +++ b/go/vt/mysqlctl/backup.go @@ -274,7 +274,7 @@ func Restore(ctx context.Context, params RestoreParams) (mysql.Position, error) } // Since this is an empty database make sure we start replication at the beginning if err := mysqld.ResetReplication(ctx); err != nil { - logger.Errorf("error reseting slave replication: %v. Continuing", err) + logger.Errorf("error resetting slave replication: %v. Continuing", err) } if err := PopulateMetadataTables(mysqld, localMetadata, dbName); err != nil { diff --git a/go/vt/mysqlctl/xtrabackupengine.go b/go/vt/mysqlctl/xtrabackupengine.go index a2a035b1be..7b01ed8817 100644 --- a/go/vt/mysqlctl/xtrabackupengine.go +++ b/go/vt/mysqlctl/xtrabackupengine.go @@ -515,7 +515,7 @@ func (be *XtrabackupEngine) extractFiles(ctx context.Context, logger logutil.Log for _, file := range srcFiles { reader := io.Reader(file) - // Create the decompresser if needed. + // Create the decompressor if needed. if compressed { decompressor, err := pgzip.NewReader(reader) if err != nil { diff --git a/go/vt/proto/query/query.pb.go b/go/vt/proto/query/query.pb.go index 3dc09020f8..d536cc1c24 100644 --- a/go/vt/proto/query/query.pb.go +++ b/go/vt/proto/query/query.pb.go @@ -3928,7 +3928,7 @@ type StreamHealthResponse struct { // realtime_stats contains information about the tablet status. // It is only filled in if the information is about a tablet. RealtimeStats *RealtimeStats `protobuf:"bytes,4,opt,name=realtime_stats,json=realtimeStats,proto3" json:"realtime_stats,omitempty"` - // AggregateStats constains information about the group of tablet status. + // AggregateStats constrains information about the group of tablet status. // It is only filled in if the information is about a group of tablets. AggregateStats *AggregateStats `protobuf:"bytes,6,opt,name=aggregate_stats,json=aggregateStats,proto3" json:"aggregate_stats,omitempty"` // tablet_alias is the alias of the sending tablet. The discovery/healthcheck.go diff --git a/go/vt/proto/vschema/vschema.pb.go b/go/vt/proto/vschema/vschema.pb.go index b3a5dd65d0..097906df39 100644 --- a/go/vt/proto/vschema/vschema.pb.go +++ b/go/vt/proto/vschema/vschema.pb.go @@ -331,7 +331,7 @@ func (m *Table) GetColumnListAuthoritative() bool { // ColumnVindex is used to associate a column to a vindex. type ColumnVindex struct { - // Legacy implemenation, moving forward all vindexes should define a list of columns. + // Legacy implementation, moving forward all vindexes should define a list of columns. Column string `protobuf:"bytes,1,opt,name=column,proto3" json:"column,omitempty"` // The name must match a vindex defined in Keyspace. Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` diff --git a/go/vt/topo/locks.go b/go/vt/topo/locks.go index f9f15a479a..ddd185635a 100644 --- a/go/vt/topo/locks.go +++ b/go/vt/topo/locks.go @@ -106,7 +106,7 @@ type locksInfo struct { // lock different things. mu sync.Mutex - // info contans all the locks we took. It is indexed by + // info contains all the locks we took. It is indexed by // keyspace (for keyspaces) or keyspace/shard (for shards). info map[string]*lockInfo } diff --git a/go/vt/vtgate/engine/merge_sort_test.go b/go/vt/vtgate/engine/merge_sort_test.go index 9ef8dfbfd9..9d6bdb02ba 100644 --- a/go/vt/vtgate/engine/merge_sort_test.go +++ b/go/vt/vtgate/engine/merge_sort_test.go @@ -73,7 +73,7 @@ func TestMergeSortNormal(t *testing.T) { t.Error(err) } - // Results are retuned one row at a time. + // Results are returned one row at a time. wantResults := sqltypes.MakeTestStreamingResults(idColFields, "1|a", "---", @@ -143,7 +143,7 @@ func TestMergeSortDescending(t *testing.T) { t.Error(err) } - // Results are retuned one row at a time. + // Results are returned one row at a time. wantResults := sqltypes.MakeTestStreamingResults(idColFields, "8|h", "---", @@ -202,7 +202,7 @@ func TestMergeSortEmptyResults(t *testing.T) { t.Error(err) } - // Results are retuned one row at a time. + // Results are returned one row at a time. wantResults := sqltypes.MakeTestStreamingResults(idColFields, "1|a", "---", diff --git a/go/vt/vtgate/engine/update.go b/go/vt/vtgate/engine/update.go index d71a672939..76717f441c 100644 --- a/go/vt/vtgate/engine/update.go +++ b/go/vt/vtgate/engine/update.go @@ -58,7 +58,7 @@ type Update struct { // ChangedVindexValues contains values for updated Vindexes during an update statement. ChangedVindexValues map[string][]sqltypes.PlanValue - // Table sepcifies the table for the update. + // Table specifies the table for the update. Table *vindexes.Table // OwnedVindexQuery is used for updating changes in lookup vindexes. diff --git a/go/vt/vtgate/gateway/discoverygateway_test.go b/go/vt/vtgate/gateway/discoverygateway_test.go index 85138ab15b..bdf9f42046 100644 --- a/go/vt/vtgate/gateway/discoverygateway_test.go +++ b/go/vt/vtgate/gateway/discoverygateway_test.go @@ -170,7 +170,7 @@ func TestShuffleTablets(t *testing.T) { sameCellTablets := []discovery.TabletStats{ts1, ts2} diffCellTablets := []discovery.TabletStats{ts3, ts4} mixedTablets := []discovery.TabletStats{ts1, ts2, ts3, ts4} - // repeat shuffling 10 times and everytime the same cell tablets should be in the front + // repeat shuffling 10 times and every time the same cell tablets should be in the front for i := 0; i < 10; i++ { shuffleTablets("cell1", sameCellTablets) if (len(sameCellTablets) != 2) || diff --git a/go/vt/vtgate/resolver.go b/go/vt/vtgate/resolver.go index be535df389..b157a03847 100644 --- a/go/vt/vtgate/resolver.go +++ b/go/vt/vtgate/resolver.go @@ -242,7 +242,7 @@ func (res *Resolver) ExecuteBatch( // one shard since it cannot merge-sort the results to guarantee ordering of // response which is needed for checkpointing. // Note we guarantee the callback will not be called concurrently -// by mutiple go routines. +// by multiple go routines. func (res *Resolver) StreamExecute( ctx context.Context, sql string, diff --git a/go/vt/vtgate/scatter_conn.go b/go/vt/vtgate/scatter_conn.go index 3bc5cb796e..12c323c3df 100644 --- a/go/vt/vtgate/scatter_conn.go +++ b/go/vt/vtgate/scatter_conn.go @@ -458,7 +458,7 @@ func (stc *ScatterConn) processOneStreamingResult(mu *sync.Mutex, fieldSent *boo // StreamExecute executes a streaming query on vttablet. The retry rules are the same. // Note we guarantee the callback will not be called concurrently -// by mutiple go routines, through processOneStreamingResult. +// by multiple go routines, through processOneStreamingResult. func (stc *ScatterConn) StreamExecute( ctx context.Context, query string, @@ -485,7 +485,7 @@ func (stc *ScatterConn) StreamExecute( // but each shard gets its own bindVars. If len(shards) is not equal to // len(bindVars), the function panics. // Note we guarantee the callback will not be called concurrently -// by mutiple go routines, through processOneStreamingResult. +// by multiple go routines, through processOneStreamingResult. func (stc *ScatterConn) StreamExecuteMulti( ctx context.Context, query string, @@ -542,7 +542,7 @@ func (tt *timeTracker) Record(target *querypb.Target) time.Time { // MessageStream streams messages from the specified shards. // Note we guarantee the callback will not be called concurrently -// by mutiple go routines, through processOneStreamingResult. +// by multiple go routines, through processOneStreamingResult. func (stc *ScatterConn) MessageStream(ctx context.Context, rss []*srvtopo.ResolvedShard, name string, callback func(*sqltypes.Result) error) error { // The cancelable context is used for handling errors // from individual streams. diff --git a/go/vt/vtgate/tx_conn.go b/go/vt/vtgate/tx_conn.go index 68c7062091..65f75223be 100644 --- a/go/vt/vtgate/tx_conn.go +++ b/go/vt/vtgate/tx_conn.go @@ -47,7 +47,7 @@ func NewTxConn(gw gateway.Gateway, txMode vtgatepb.TransactionMode) *TxConn { } } -// Begin begins a new transaction. If one is already in progress, it commmits it +// Begin begins a new transaction. If one is already in progress, it commits it // and starts a new one. func (txc *TxConn) Begin(ctx context.Context, session *SafeSession) error { if session.InTransaction() { diff --git a/go/vt/vtgate/vtgate.go b/go/vt/vtgate/vtgate.go index 5b5094d962..a47a45b0ad 100644 --- a/go/vt/vtgate/vtgate.go +++ b/go/vt/vtgate/vtgate.go @@ -331,7 +331,7 @@ func (vtg *VTGate) ExecuteBatch(ctx context.Context, session *vtgatepb.Session, // StreamExecute executes a streaming query. This is a V3 function. // Note we guarantee the callback will not be called concurrently -// by mutiple go routines. +// by multiple go routines. func (vtg *VTGate) StreamExecute(ctx context.Context, session *vtgatepb.Session, sql string, bindVariables map[string]*querypb.BindVariable, callback func(*sqltypes.Result) error) error { // In this context, we don't care if we can't fully parse destination destKeyspace, destTabletType, dest, _ := vtg.executor.ParseDestinationTarget(session.TargetString) @@ -663,7 +663,7 @@ handleError: // response which is needed for checkpointing. // The api supports supplying multiple KeyspaceIds to make it future proof. This is a legacy function. // Note we guarantee the callback will not be called concurrently -// by mutiple go routines. +// by multiple go routines. func (vtg *VTGate) StreamExecuteKeyspaceIds(ctx context.Context, sql string, bindVariables map[string]*querypb.BindVariable, keyspace string, keyspaceIds [][]byte, tabletType topodatapb.TabletType, options *querypb.ExecuteOptions, callback func(*sqltypes.Result) error) error { startTime := time.Now() ltt := topoproto.TabletTypeLString(tabletType) @@ -712,7 +712,7 @@ handleError: // response which is needed for checkpointing. // The api supports supplying multiple keyranges to make it future proof. This is a legacy function. // Note we guarantee the callback will not be called concurrently -// by mutiple go routines. +// by multiple go routines. func (vtg *VTGate) StreamExecuteKeyRanges(ctx context.Context, sql string, bindVariables map[string]*querypb.BindVariable, keyspace string, keyRanges []*topodatapb.KeyRange, tabletType topodatapb.TabletType, options *querypb.ExecuteOptions, callback func(*sqltypes.Result) error) error { startTime := time.Now() ltt := topoproto.TabletTypeLString(tabletType) @@ -756,7 +756,7 @@ handleError: // StreamExecuteShards executes a streaming query on the specified shards. This is a legacy function. // Note we guarantee the callback will not be called concurrently -// by mutiple go routines. +// by multiple go routines. func (vtg *VTGate) StreamExecuteShards(ctx context.Context, sql string, bindVariables map[string]*querypb.BindVariable, keyspace string, shards []string, tabletType topodatapb.TabletType, options *querypb.ExecuteOptions, callback func(*sqltypes.Result) error) error { startTime := time.Now() ltt := topoproto.TabletTypeLString(tabletType) @@ -973,7 +973,7 @@ func (vtg *VTGate) GetSrvKeyspace(ctx context.Context, keyspace string) (*topoda // MessageStream is part of the vtgate service API. This is a V2 level API // that's sent to the Resolver. // Note we guarantee the callback will not be called concurrently -// by mutiple go routines. +// by multiple go routines. func (vtg *VTGate) MessageStream(ctx context.Context, keyspace string, shard string, keyRange *topodatapb.KeyRange, name string, callback func(*sqltypes.Result) error) error { startTime := time.Now() ltt := topoproto.TabletTypeLString(topodatapb.TabletType_MASTER) @@ -1041,7 +1041,7 @@ func (vtg *VTGate) MessageAckKeyspaceIds(ctx context.Context, keyspace string, n // UpdateStream is part of the vtgate service API. // Note we guarantee the callback will not be called concurrently -// by mutiple go routines, as the current implementation can only target +// by multiple go routines, as the current implementation can only target // one shard. func (vtg *VTGate) UpdateStream(ctx context.Context, keyspace string, shard string, keyRange *topodatapb.KeyRange, tabletType topodatapb.TabletType, timestamp int64, event *querypb.EventToken, callback func(*querypb.StreamEvent, int64) error) error { startTime := time.Now() diff --git a/go/vt/wrangler/testlib/init_shard_master_test.go b/go/vt/wrangler/testlib/init_shard_master_test.go index faf6d9069c..8f10a297c1 100644 --- a/go/vt/wrangler/testlib/init_shard_master_test.go +++ b/go/vt/wrangler/testlib/init_shard_master_test.go @@ -236,7 +236,7 @@ func TestInitMasterShardOneSlaveFails(t *testing.T) { // also change the master alias in the Shard object, to make sure it // is set back. _, err := ts.UpdateShardFields(ctx, master.Tablet.Keyspace, master.Tablet.Shard, func(si *topo.ShardInfo) error { - // note it's OK to retry this and increment mutiple times, + // note it's OK to retry this and increment multiple times, // we just want it to be different si.MasterAlias.Uid++ return nil diff --git a/misc/git/prepare-commit-msg.bugnumber b/misc/git/prepare-commit-msg.bugnumber index 0e14091f23..dc73f2b763 100755 --- a/misc/git/prepare-commit-msg.bugnumber +++ b/misc/git/prepare-commit-msg.bugnumber @@ -3,8 +3,8 @@ # This script is run during "git commit" before the commit message editor # is shown. # -# It automatically adds a BUG= line to the default commit -# message if the branch name starts with "b". +# It automatically adds a BUG= line to the default commit +# message if the branch name starts with "b". # Note that refers to a Google internal bug number. branch="$(git rev-parse --abbrev-ref HEAD)" diff --git a/proto/query.proto b/proto/query.proto index f94a7aa739..20b4fc5d8b 100644 --- a/proto/query.proto +++ b/proto/query.proto @@ -826,7 +826,7 @@ message StreamHealthResponse { // It is only filled in if the information is about a tablet. RealtimeStats realtime_stats = 4; - // AggregateStats constains information about the group of tablet status. + // AggregateStats constrains information about the group of tablet status. // It is only filled in if the information is about a group of tablets. AggregateStats aggregate_stats = 6; diff --git a/proto/vschema.proto b/proto/vschema.proto index 12e6154f04..bc94d48611 100644 --- a/proto/vschema.proto +++ b/proto/vschema.proto @@ -87,7 +87,7 @@ message Table { // ColumnVindex is used to associate a column to a vindex. message ColumnVindex { - // Legacy implemenation, moving forward all vindexes should define a list of columns. + // Legacy implementation, moving forward all vindexes should define a list of columns. string column = 1; // The name must match a vindex defined in Keyspace. string name = 2; diff --git a/test/prepared_statement_test.py b/test/prepared_statement_test.py index 2e1c946888..475b8dfa84 100755 --- a/test/prepared_statement_test.py +++ b/test/prepared_statement_test.py @@ -308,7 +308,7 @@ class TestPreparedStatements(unittest.TestCase): self.fail("Delete failed") cursor.close() - # Reseting the connection + # resetting the connection conn.cmd_reset_connection() cursor = conn.cursor(cursor_class=MySQLCursorPrepared) cursor.execute('select * from vt_prepare_stmt_test where id = %s', (1,))