Skip to content
This repository was archived by the owner on Dec 16, 2022. It is now read-only.

Sync with upstream vitess; 2018-12-14#120

Merged
setassociative merged 50 commits intomasterfrom
20181214-merge-upstream
Dec 14, 2018
Merged

Sync with upstream vitess; 2018-12-14#120
setassociative merged 50 commits intomasterfrom
20181214-merge-upstream

Conversation

@setassociative
Copy link
Copy Markdown

@setassociative setassociative commented Dec 14, 2018

tl;dr: all changes look 👍

Slack changes

Non-Slack changes

Source material

$ git log tinyspeck/master..upstream/master --merges --oneline
eb5a5e0e4 (upstream/master) Merge pull request #4453 from mpawliszyn/mikepaw.update-snapshot
84a352400 Merge pull request #4447 from mpawliszyn/mikepaw.better-maven-defaults
be9745195 Merge pull request #4439 from smourachov/grpc-java-allow-modify-channel-builder
4f192d100 (tag: v3.0.0-rc.3, tag: v3.0) Merge pull request #4438 from planetscale/ss-local-fix
7f0ee4c74 Merge pull request #4434 from tinyspeck/add-vschema-local-examples
43aa7e934 (tag: v3.0.0-rc.2) Merge pull request #4437 from planetscale/ss-default
8c567f765 Merge pull request #4419 from derekperkins/remove-mycnf
ecb972f2a Merge pull request #4433 from Santiclause/gcs-backup-scope
8e64c77c0 (tag: v3.0.0-rc.1) Merge pull request #4353 from tinyspeck/fix-for-consul-master-election
eccf91289 Merge pull request #4412 from tinyspeck/vschema-alter-syntax
2a950238d Merge pull request #4429 from planetscale/ds-add-to-example
f2118cc41 Merge pull request #4427 from planetscale/ds-local-example
3b2294b7e Merge pull request #4385 from tinyspeck/vtctl-support-vschema-ddls
fb8c46f78 Merge pull request #4424 from tinyspeck/brirams/remote_nfs_from_vagrantfile

Rafael Chacon and others added 30 commits November 8, 2018 16:47
Do not reuse a consul lock
ccf9ef2 
* When you lose a consul lock, you can't reuse that lock. Existent code does not
  does that and should a vtctld master lose a lock, it gets stuck in a state
  where it can't never use that lock again and you will need to restart the
  process.

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
@demmer
rework vtgate's vschema_manager to use topotools.RebuildVschema
670647b 
Pull in the topotools.RebuildVschema implementation into the vtgate
VschemaManager to share the same helper function that vtctl uses to
find all cells and propagate the changed vschema to all of them.

This changes the UpdateVschema interface to take in a single modified
keyspace and not the whole SrvVschema.

Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer
add a -dry_run flag to vtctl ApplyVschema
94cb4af 
Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer
move the vschema ddl implementation into a new topotools helper
6acad1d 
Abstract out the execution of the vschema ddl statements into a new
function in topotools.

Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer
add vtctl support to alter vschema using sql statements
2682687 
Add new flags to ApplyVschema to be able to take a sql ddl statement
either on the command line or in a file to enable vschema changes
without having to edit the whole json file.

Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer
set the sharded bit when creating the first vindex in a keyspace
1d274cf 
Make sure to set the Sharded bit to true when creating the first
vindex in a keyspace, otherwise the vschema ddl statements can't be
used to bootstrap a new sharded keyspace.

Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer
fix vschema test expectations
54f2192 
Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer
change parameter to -dry-run for consistency
1b0db07 
Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer
update doc strings as suggested in pr review
17af5ea 
Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer
rework and clean up the implementation as suggested in PR feedback
ea1e126 
Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer
revert change to use topotools.RebuildVSchema in the executor
e47bed0 
The fact that the vschema ddl needs to go through the normal srvtopo
interface to get to the underlying topo server when applying vschema
ddl operations doesn't play well with the SandboxTopo used in some of
the unit tests.

So restore the previous implementation which edits the SrvVschema in
place and then reapplies it to all cells, rather than trying to reuse
topotools.RebuildVschema from the executor.

Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@derekperkins
config: rm secure_file_priv & innodb_support_xa
1a50a4d 
Signed-off-by: Derek Perkins <derek@derekperkins.com>
@brirams
stop using NFS for synced folders, put a comment explaining why
9358393 
Signed-off-by: Brian Ramos <brirams@users.noreply.github.com>
@demmer
Merge pull request vitessio#4424 from tinyspeck/brirams/remote_nfs_fr…
fb8c46f 
…om_vagrantfile

[vagrant] Remove NFS option from VM synced folder
@sougou
Merge pull request vitessio#4385 from tinyspeck/vtctl-support-vschema…
3b2294b 
…-ddls

vtctl support for vschema ddls
@deepthi
adapt helm example to run locally
5fba41f 
Signed-off-by: deepthi <deepthi@planetscale.com>
@deepthi
adapt helm example to run locally
54299e3 
Signed-off-by: deepthi <deepthi@planetscale.com>
@deepthi
remove unused scripts
1b83bf3 
Signed-off-by: deepthi <deepthi@planetscale.com>
@sougou
Merge pull request vitessio#4427 from planetscale/ds-local-example
f2118cc 
WIP: adapt helm/k8s example to run locally
@deepthi
add descriptive comments to scripts, add etcd option, set MYSQL_FLAVO…
e2ffdb2 
…R is it isn't already set

Signed-off-by: deepthi <deepthi@planetscale.com>
@deepthi
remove unused files, add sql scripts to show intermediate and final r…
c16933e 
…esults of resharding

Signed-off-by: deepthi <deepthi@planetscale.com>
@deepthi
add back files required for test
66426a9 
Signed-off-by: deepthi <deepthi@planetscale.com>
@demmer
change the vschema ddl syntax to use alter vschema ...
8ea642d 
Rework the vschema syntax so that instead of top-level create/drop
statements and alter table we use a consistent syntax of:

alter vschema create vindex...
alter vschema drop vindex ...
alter vschema on <table> add vindex ...
alter vschema on <table> drop vindex ...

Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer
update the show syntax to match the vschema ddl changes
ae79ffd 
Make the show syntax consistent:
`show vschema vindexes`
`show vschema tables`

Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@demmer
add vschema ddl syntax to add/remove tables from unsharded keyspaces
b55d155 
Since unsharded keyspaces don't have vindex definitions, implement
a new syntax for adding / removing tables from the vschema:

`alter vschema add table test_table`
`alter vschema drop table test_table`

Signed-off-by: Michael Demmer <mdemmer@slack-corp.com>
@deepthi
use auth=none for vtgate, move sql scripts to common location
06cb4f4 
Signed-off-by: deepthi <deepthi@planetscale.com>
@deepthi
add mysql helper script to local example, remove calls to mysql from …
2be922a 
…scripts, they will be executed by the user using lmysql.sh

Signed-off-by: deepthi <deepthi@planetscale.com>
@deepthi
codeclimate fix
0ccc3b9 
Signed-off-by: deepthi <deepthi@planetscale.com>
@deepthi
shellcheck fixes
d97a194 
Signed-off-by: deepthi <deepthi@planetscale.com>
Calls Unlock explicitly after potetiantly losing it
b3a9459 
Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
Rafael Chacon and others added 20 commits December 7, 2018 15:34
Fix typo in comment
dc2cbe0 
Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
@Santiclause
Add scope to oauth token for gcs backup storage client
74c80dd 
Signed-off-by: Michael Hebelka <michael.hebelka@sharpspring.com>
@sougou
Merge pull request vitessio#4429 from planetscale/ds-add-to-example
2a95023 
Enhance local example
@sougou
Merge pull request vitessio#4412 from tinyspeck/vschema-alter-syntax
eccf912 
vschema alter syntax
@demmer
Merge pull request vitessio#4353 from tinyspeck/fix-for-consul-master…
8e64c77 
…-election

Do not reuse a consul lock
@derekperkins
Merge pull request vitessio#4433 from Santiclause/gcs-backup-scope
ecb972f 
Add scope to oauth token for gcs backup storage client
Adds removed vschema
841e07c 
Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
@sougou
Merge pull request vitessio#4419 from derekperkins/remove-mycnf
8c567f7 
config: rm secure_file_priv & innodb_support_xa
@sougou
helm: add missing default
73b3e4a 
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
@sougou
Merge pull request vitessio#4437 from planetscale/ss-default
43aa7e9 
helm: add missing default
@sougou
local example: fix typos
c009ca7 
The tablet kills were inverted between 100 vs 200
Also added a delete of all data on teardown

Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
@sougou
Merge pull request vitessio#4434 from tinyspeck/add-vschema-local-exa…
7f0ee4c 
…mples

Adds removed vschema
@sougou
Merge pull request vitessio#4438 from planetscale/ss-local-fix
4f192d1 
local example: fix typos
Allow subclasses of GrpcClientFactory to modify channel builder
7ec016d 
Signed-off-by: Serguei Mourachov <serguei@slack-corp.com>
@demmer
Merge pull request vitessio#4439 from smourachov/grpc-java-allow-modi…
be97451 
…fy-channel-builder

Allow subclasses of GrpcClientFactory to modify channel builder
@mpawliszyn
Parents the parent pom of the standard sonatype oss pom for better de…
e508130 
…faults.

Signed-off-by: Michael Pawliszyn <mikepaw@squareup.com>
@mpawliszyn
Merge pull request vitessio#4447 from mpawliszyn/mikepaw.better-maven…
84a3524 
…-defaults

Parents the parent pom of the standard sonatype oss pom for better de…
@mpawliszyn
java: Bump SNAPSHOT version to 3.1.0-SNAPSHOT after Vitess release 3.0.
8d93fe9 
Signed-off-by: Michael Pawliszyn <mikepaw@squareup.com>
@mpawliszyn
Merge pull request vitessio#4453 from mpawliszyn/mikepaw.update-snapshot
eb5a5e0 
java: Bump SNAPSHOT version to 3.1.0-SNAPSHOT after Vitess release 3.0.
Merge remote-tracking branch 'upstream/master' into setassociative-me…
55a4edd 
…rge-upstream
@rafael
Copy link
Copy Markdown

rafael commented Dec 14, 2018

LGTM +1

@setassociative setassociative merged commit 06241e2 into master Dec 14, 2018
@setassociative setassociative deleted the 20181214-merge-upstream branch December 14, 2018 22:28
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@rafael rafael rafael approved these changes

@brirams brirams brirams approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@setassociative @rafael @brirams @demmer @derekperkins @sougou @deepthi @Santiclause @mpawliszyn