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

[vtctld do not merge] Custom build for vtctld development (cherry-picks on top of 9.0) #211

Open
wants to merge 18 commits into
base: master
Choose a base branch
from

Conversation

rafael
Copy link

@rafael rafael commented May 18, 2021

Description

There are merge conlficts, but given that this branch we don't plan to merge, it should be ok to ignore.

rohit-nayak-ps and others added 18 commits April 5, 2021 19:47
[vtctld] Migrate cell getters

Signed-off-by: Andrew Mason <amason@slack-corp.com>
[vtctld] migrate tablet getters

Signed-off-by: Andrew Mason <amason@slack-corp.com>
…nd_pkg

[vtctld] vtctldclient command pkg

Signed-off-by: Andrew Mason <amason@slack-corp.com>
[vtctld] Add GetSrvVSchema command

Signed-off-by: Andrew Mason <amason@slack-corp.com>
[vtctld] Migrate GetSchema

Signed-off-by: Andrew Mason <amason@slack-corp.com>
[vtctld] Migrate ListBackups as GetBackups in new vtctld server

Signed-off-by: Andrew Mason <amason@slack-corp.com>
[vtctld] Migrate GetVSchema to VtctldServer

Signed-off-by: Andrew Mason <amason@slack-corp.com>
[vtctld] Migrate topo management RPCs

Signed-off-by: Andrew Mason <amason@slack-corp.com>
…ce_errors

[vtctldclient] Set `SilenceErrors` on the root command, so we don't double-log
[vtctld | tests only] testtmclient refactor

Note: Manually deleted api_test.go due to cherry-pick conflict

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
Provide named function for squashing usage errors; start using it

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
Note (@rafael): This one required a bunch of manual intervention
[vtctld] Add v0 GetWorkflows rpc and workflow/vexec packages

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
[vtctld] Migrate GetSrvKeyspace as GetSrvKeyspaces in VtctldServer

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
…cation_positions

[vtctld] Migrate ShardReplicationPositions

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
[vtctl|vtctldserver] List/Get Tablets timeouts

Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
Signed-off-by: Rafael Chacon <rafael@slack-corp.com>
Signed-off-by: Malcolm Akinje <makinje@slack-corp.com>
Signed-off-by: Malcolm Akinje <makinje@slack-corp.com>
@rafael rafael requested review from ajm188 and doeg as code owners May 18, 2021 23:26
@@ -2770,13 +2709,14 @@ func commandValidateSchemaShard(ctx context.Context, wr *wrangler.Wrangler, subF
if *excludeTables != "" {
excludeTableArray = strings.Split(*excludeTables, ",")
}
return wr.ValidateSchemaShard(ctx, keyspace, shard, excludeTableArray, *includeViews)
return wr.ValidateSchemaShard(ctx, keyspace, shard, excludeTableArray, *includeViews, *includeVSchema)
Copy link

Choose a reason for hiding this comment

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

The only conflict that was potentially concerning to me was around making sure we had Malcolm's work, and it looks to me like we've got the right changes, so I'm good to go on this.

Base automatically changed from slack-vitess-9-2021.05.18r6 to master May 19, 2021 21:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants