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

Slack vitess 9 2021.06.07r13.vtctld#217

Merged
ajm188 merged 10 commits intoslack-vitess-9-2021.06.07r10.vtctldfrom
slack-vitess-9-2021.06.07r13.vtctld
Jun 16, 2021
Merged

Slack vitess 9 2021.06.07r13.vtctld#217
ajm188 merged 10 commits intoslack-vitess-9-2021.06.07r10.vtctldfrom
slack-vitess-9-2021.06.07r13.vtctld

Conversation

@ajm188
Copy link

@ajm188 ajm188 commented Jun 15, 2021

Description

This brings the following PRs into our vtctld deploy:

I also needed to commit a workaround to a type change in the sqlparser package that we don't have yet, which just amounted to converting some strings to []byte. For more details, see a4a5594

I also opened another PR (#218) to merge this change into this branch, and we can merge the final result. It's not merged into upstream yet, so I wanted eyes on just that diff separately.

Andrew Mason added 5 commits June 14, 2021 21:23
[workflow] Add vreplication_log data to workflow protos, and `VtctldServer.GetWorkflows` method

Signed-off-by: Andrew Mason <amason@slack-corp.com>
In upstream (where the previous commit was cherry-picked from), all of
the `New<columntype>` functions take a `string` argument, but previously
(and therefore in our vtctld branch) they took a `[]byte`.

Signed-off-by: Andrew Mason <amason@slack-corp.com>
Steps taken:
1. `git checkout upstream/main -- go/vt/vtctl/grpcvtctldserver/server_test.go`
2. `git checkout upstream/main -- go/vt/vtctl/grpcvtctldserver/testutil`
3. Replace imports of `google.golang.org/protobuf/proto` with `github.com/golang/protobuf/proto`, as we haven't taken the protobuf upgrade yet
4. Remove all types referenced in the tests that we haven't added to vtctldatapb yet

Note: at the time, `upstream/main` resolved to `83dfb9aa59ce47a313ecb7bc12804298e76d350c`.

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

[vtctld] Add GetSrvVSchemas command

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

[vtctldserver] Add additional backup info fields

Signed-off-by: Andrew Mason <amason@slack-corp.com>
@ajm188 ajm188 requested review from doeg and guidoiaquinti June 15, 2021 20:51
Andrew Mason added 4 commits June 15, 2021 17:32
…le/BackupEngine interfaces to support populating BackupInfo.Status

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

[workflow] Call `scanWorkflow` concurrently

Signed-off-by: Andrew Mason <amason@slack-corp.com>
Copy link

@doeg doeg left a comment

Choose a reason for hiding this comment

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

Yay 🎉 excited

@ajm188 ajm188 merged commit ef97c9f into slack-vitess-9-2021.06.07r10.vtctld Jun 16, 2021
@ajm188 ajm188 deleted the slack-vitess-9-2021.06.07r13.vtctld branch June 16, 2021 14:31
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.

2 participants