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

6.0 Slack vitess release merge (w/consul 1.5.1, no k3s) #163

Merged
merged 1,101 commits into from
Jun 26, 2020

Conversation

ajm188
Copy link

@ajm188 ajm188 commented Jun 22, 2020

Git Shenanigans

To avoid reverting back to consul 1.4.5, but also without needing to go all the way to 1.8.0, we needed to pull out the k8s topo bits, which were done in the following commits:

Slack Changes

Upstream Changes

PLANNED REPARENT FIXES

When updating from a version before this PR to a version after it, it is critical that you follow the recommended upgrade order. In particular, you must upgrade all the vttablets in the cluster before upgrading any of the vtctlds.

query

topo

vttablet

vtgate (some of the things under query are arguably vtgate 🤷‍♂️ )

vtctld

vrep

backups

metrics

session variables

olap

heartbeat

vtexplain

java

Misc

saifalharthi and others added 30 commits April 14, 2020 09:43
Signed-off-by: Saif Alharthi <saif@saifalharthi.me>
Signed-off-by: Saif Alharthi <saif@saifalharthi.me>
Signed-off-by: Saif Alharthi <saif@saifalharthi.me>
Signed-off-by: Saif Alharthi <saif@saifalharthi.me>
Signed-off-by: Andres Taylor <andres@planetscale.com>
Signed-off-by: Andres Taylor <andres@planetscale.com>
Signed-off-by: Andres Taylor <andres@planetscale.com>
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Signed-off-by: Saif Alharthi <saif@saifalharthi.me>
… tablet is written to topo

Signed-off-by: deepthi <deepthi@planetscale.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
PromoteSlaveWhenCaughtUp RPC

Signed-off-by: deepthi <deepthi@planetscale.com>
Signed-off-by: deepthi <deepthi@planetscale.com>
…th current master

Signed-off-by: deepthi <deepthi@planetscale.com>
Signed-off-by: deepthi <deepthi@planetscale.com>
Signed-off-by: deepthi <deepthi@planetscale.com>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
sougou and others added 17 commits June 15, 2020 21:41
Now that we allow fractional seconds, let's use this as a
standardized unit.

Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>

Signed-off-by: deepthi <deepthi@planetscale.com>
This flag didn't previously exist, but there are users that want
to fine tune this setting.

Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
Fixes vitessio#6264
Fixes vitessio#6285

Signed-off-by: Andres Taylor <andres@planetscale.com>

Signed-off-by: deepthi <deepthi@planetscale.com>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
Signed-off-by: Andres Taylor <andres@planetscale.com>
Signed-off-by: Andres Taylor <andres@planetscale.com>
…s to floats

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
…ar-clashes

Make sure to protect insert lookup queries from bind var name clashes (6.0)
@ajm188 ajm188 force-pushed the slack-vitess-release-merge branch from c486e35 to 3ba31fd Compare June 22, 2020 23:41
This reverts commit f97eef3, reversing
changes made to 9e74b07.

Signed-off-by: Andrew Mason <amason@slack-corp.com>
Signed-off-by: Andrew Mason <amason@slack-corp.com>
@ajm188 ajm188 force-pushed the slack-vitess-release-merge branch from 3ba31fd to f6f2cfa Compare June 22, 2020 23:58
Signed-off-by: Andrew Mason <amason@slack-corp.com>
@ajm188 ajm188 changed the title 6.0 Slack vitess release merge 6.0 Slack vitess release merge (w/consul 1.5.1, no k3s) Jun 23, 2020
Copy link

@setassociative setassociative left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all seems fine. Some things to call out though:

And the following sorta worry me only in that the are large / complex with minimal discussion (and I don't know the codebase well enough to grok them).. but presumably it should be somewhat obvious if they fail 😓

@ajm188 ajm188 merged commit 007744e into slack-vitess-2020.06.22-r0 Jun 26, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet