Skip to content

Commit

Permalink
Minor changes after self review
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Lord <[email protected]>
  • Loading branch information
mattlord committed Oct 2, 2023
1 parent f809f86 commit 8f11f68
Show file tree
Hide file tree
Showing 7 changed files with 951 additions and 950 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func commandExternalize(cmd *cobra.Command, args []string) error {
}

output := fmt.Sprintf("LookupVindex %s has been externalized", maps.Keys(baseOptions.Vindex.Vindexes)[0])
if resp.Deleted {
if resp.WorkflowDeleted {
output = output + fmt.Sprintf(" and the %s VReplication workflow has been deleted", baseOptions.Workflow)
}
fmt.Println(output)
Expand Down Expand Up @@ -257,7 +257,7 @@ func registerCommands(root *cobra.Command) {
root.AddCommand(base)

// This will create the lookup vindex in the specified keyspace
// and setup a VReplication workflow to backfill it.
// and setup a VReplication workflow to backfill its targe table.
create.Flags().StringSliceVar(&createOptions.Cells, "cells", nil, "Cells to look in for source tablets to replicate from.")
create.Flags().Var((*topoprotopb.TabletTypeListFlag)(&createOptions.TabletTypes), "tablet-types", "Source tablet types to replicate from.")
create.Flags().BoolVar(&createOptions.ContinueAfterCopyWithOwner, "continue-after-copy-with-owner", false, "Vindex will continue materialization after copy when an owner is provided")
Expand Down
1,843 changes: 922 additions & 921 deletions go/vt/proto/vtctldata/vtctldata.pb.go

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions go/vt/proto/vtctldata/vtctldata_vtproto.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go/vt/vtctl/workflow/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ func (s *Server) LookupVindexExternalize(ctx context.Context, req *vtctldatapb.L
}); derr != nil {
return nil, vterrors.Errorf(vtrpcpb.Code_FAILED_PRECONDITION, "failed to delete workflow %s: %v", req.Workflow, derr)
}
resp.Deleted = true
resp.WorkflowDeleted = true
}

// Remove the write_only param and save the source vschema.
Expand Down
2 changes: 1 addition & 1 deletion proto/vtctldata.proto
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ message LookupVindexExternalizeRequest {

message LookupVindexExternalizeResponse {
// Was the workflow also deleted.
bool deleted = 1;
bool workflow_deleted = 1;
}

message MoveTablesCreateRequest {
Expand Down
8 changes: 4 additions & 4 deletions web/vtadmin/src/proto/vtadmin.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions web/vtadmin/src/proto/vtadmin.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8f11f68

Please sign in to comment.