Skip to content

Commit

Permalink
add support for vtgate traffic mirroring (topo, workflow)
Browse files Browse the repository at this point in the history
Signed-off-by: Max Englander <[email protected]>
  • Loading branch information
maxenglander committed May 22, 2024
1 parent 951f273 commit 79983de
Show file tree
Hide file tree
Showing 45 changed files with 7,431 additions and 735 deletions.
37 changes: 36 additions & 1 deletion changelog/20.0/20.0.0/summary.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- [Delete with Multi Target Support](#delete-multi-target)
- [User Defined Functions Support](#udf-support)
- [Insert Row Alias Support](#insert-row-alias-support)
- **[Traffic Mirroring](#traffic-mirroring)**
- **[Query Timeout](#query-timeout)**
- **[Flag changes](#flag-changes)**
- [`pprof-http` default change](#pprof-http-default)
Expand Down Expand Up @@ -289,6 +290,40 @@ Example:

More details about how it works is available in [MySQL Docs](https://dev.mysql.com/doc/refman/8.0/en/insert-on-duplicate.html)

### <a id="traffic-mirroring"/>Traffic Mirroring

Traffic mirroring is intended to help reduce some of the uncertainty inherent to `MoveTables SwitchTraffic`. When traffic mirroring is enabled, VTGate will mirror a percentage of traffic from one keyspace to another.

Mirror rules may be enabled through `vtctldclient` in two ways:

* With `ApplyMirrorRules`.
* With `MoveTables MirrorTraffic`, which uses `ApplyMirrorRules` under the hood.

Example with `ApplyMirrorRules`:

```bash
$ vtctldclient --server :15999 ApplyMirrorRules --rules "$(cat <<EOF
{
"rules": [
{
"from_table": "commerce.corders",
"to_table": "customer.corders",
"percent": 5.0
}
]
}
EOF
)"
```

Example with `MoveTables MirrorTraffic`:

```bash
$ vtctldclient --server :15999 MoveTables --target-keyspace customer --workflow commerce2customer MirrorTraffic --percent 5.0
```

Mirror rules can be inspected with `GetMirrorRules`.

### <a id="query-timeout"/>Query Timeout
On a query timeout, Vitess closed the connection using the `kill connection` statement. This leads to connection churn
which is not desirable in some cases. To avoid this, Vitess now uses the `kill query` statement to cancel the query.
Expand Down Expand Up @@ -334,4 +369,4 @@ The internal gRPC client now caches the static auth credentials and supports rel
#### <a id="updated-node"/>vtadmin-web updated to node v20.12.2 (LTS)
Building `vtadmin-web` now requires node >= v20.12.0 (LTS). Breaking changes from v18 to v20 can be found at https://nodejs.org/en/blog/release/v20.12.0 -- with no known issues that apply to VTAdmin.
Full details on the node v20.12.2 release can be found at https://nodejs.org/en/blog/release/v20.12.2.
Full details on the node v20.12.2 release can be found at https://nodejs.org/en/blog/release/v20.12.2.
5 changes: 5 additions & 0 deletions go/cmd/vtcombo/cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,11 @@ func run(cmd *cobra.Command, args []string) (err error) {
return fmt.Errorf("Failed to load routing rules: %w", err)
}

// attempt to load any mirror rules specified by tpb
if err := vtcombo.InitMirrorRules(context.Background(), ts, tpb.GetMirrorRules()); err != nil {
return fmt.Errorf("Failed to load mirror rules: %w", err)
}

servenv.Init()
tabletenv.Init()

Expand Down
157 changes: 157 additions & 0 deletions go/cmd/vtctldclient/command/mirror_rules.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
/*
Copyright 2024 The Vitess Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package command

import (
"errors"
"fmt"
"os"
"strings"

"github.com/spf13/cobra"

"vitess.io/vitess/go/cmd/vtctldclient/cli"
"vitess.io/vitess/go/json2"

vschemapb "vitess.io/vitess/go/vt/proto/vschema"
vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
)

var (
// ApplyMirrorRules makes an ApplyMirrorRules gRPC call to a vtctld.
ApplyMirrorRules = &cobra.Command{
Use: "ApplyMirrorRules {--rules RULES | --rules-file RULES_FILE} [--cells=c1,c2,...] [--skip-rebuild] [--dry-run]",
Short: "Applies the VSchema mirror rules.",
DisableFlagsInUseLine: true,
Args: cobra.NoArgs,
RunE: commandApplyMirrorRules,
}
// GetMirrorRules makes a GetMirrorRules gRPC call to a vtctld.
GetMirrorRules = &cobra.Command{
Use: "GetMirrorRules",
Short: "Displays the VSchema mirror rules.",
DisableFlagsInUseLine: true,
Args: cobra.NoArgs,
RunE: commandGetMirrorRules,
}
)

var applyMirrorRulesOptions = struct {
Rules string
RulesFilePath string
Cells []string
SkipRebuild bool
DryRun bool
}{}

func commandApplyMirrorRules(cmd *cobra.Command, args []string) error {
if applyMirrorRulesOptions.Rules != "" && applyMirrorRulesOptions.RulesFilePath != "" {
return fmt.Errorf("cannot pass both --rules (=%s) and --rules-file (=%s)", applyMirrorRulesOptions.Rules, applyMirrorRulesOptions.RulesFilePath)
}

if applyMirrorRulesOptions.Rules == "" && applyMirrorRulesOptions.RulesFilePath == "" {
return errors.New("must pass exactly one of --rules or --rules-file")
}

cli.FinishedParsing(cmd)

var rulesBytes []byte
if applyMirrorRulesOptions.RulesFilePath != "" {
data, err := os.ReadFile(applyMirrorRulesOptions.RulesFilePath)
if err != nil {
return err
}

rulesBytes = data
} else {
rulesBytes = []byte(applyMirrorRulesOptions.Rules)
}

rr := &vschemapb.MirrorRules{}
if err := json2.Unmarshal(rulesBytes, &rr); err != nil {
return err
}

// Round-trip so when we display the result it's readable.
data, err := cli.MarshalJSON(rr)
if err != nil {
return err
}

if applyMirrorRulesOptions.DryRun {
fmt.Printf("[DRY RUN] Would have saved new MirrorRules object:\n%s\n", data)

if applyMirrorRulesOptions.SkipRebuild {
fmt.Println("[DRY RUN] Would not have rebuilt VSchema graph, would have required operator to run RebuildVSchemaGraph for changes to take effect")
} else {
fmt.Print("[DRY RUN] Would have rebuilt the VSchema graph")
if len(applyMirrorRulesOptions.Cells) == 0 {
fmt.Print(" in all cells\n")
} else {
fmt.Printf(" in the following cells: %s.\n", strings.Join(applyMirrorRulesOptions.Cells, ", "))
}
}

return nil
}

_, err = client.ApplyMirrorRules(commandCtx, &vtctldatapb.ApplyMirrorRulesRequest{
MirrorRules: rr,
SkipRebuild: applyMirrorRulesOptions.SkipRebuild,
RebuildCells: applyMirrorRulesOptions.Cells,
})
if err != nil {
return err
}

fmt.Printf("New MirrorRules object:\n%s\nIf this is not what you expected, check the input data (as JSON parsing will skip unexpected fields).\n", data)

if applyMirrorRulesOptions.SkipRebuild {
fmt.Println("Skipping rebuild of VSchema graph, will need to run RebuildVSchemaGraph for changes to take effect.")
}

return nil
}

func commandGetMirrorRules(cmd *cobra.Command, args []string) error {
cli.FinishedParsing(cmd)

resp, err := client.GetMirrorRules(commandCtx, &vtctldatapb.GetMirrorRulesRequest{})
if err != nil {
return err
}

data, err := cli.MarshalJSON(resp.MirrorRules)
if err != nil {
return err
}

fmt.Printf("%s\n", data)

return nil
}

func init() {
ApplyMirrorRules.Flags().StringVarP(&applyMirrorRulesOptions.Rules, "rules", "r", "", "Mirror rules, specified as a string.")
ApplyMirrorRules.Flags().StringVarP(&applyMirrorRulesOptions.RulesFilePath, "rules-file", "f", "", "Path to a file containing mirror rules specified as JSON.")
ApplyMirrorRules.Flags().StringSliceVarP(&applyMirrorRulesOptions.Cells, "cells", "c", nil, "Limit the VSchema graph rebuilding to the specified cells. Ignored if --skip-rebuild is specified.")
ApplyMirrorRules.Flags().BoolVar(&applyMirrorRulesOptions.SkipRebuild, "skip-rebuild", false, "Skip rebuilding the SrvVSchema objects.")
ApplyMirrorRules.Flags().BoolVarP(&applyMirrorRulesOptions.DryRun, "dry-run", "d", false, "Load the specified mirror rules as a validation step, but do not actually apply the rules to the topo.")
Root.AddCommand(ApplyMirrorRules)

Root.AddCommand(GetMirrorRules)
}
89 changes: 89 additions & 0 deletions go/cmd/vtctldclient/command/vreplication/common/mirrortraffic.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/*
Copyright 2024 The Vitess Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package common

import (
"bytes"
"fmt"

"github.com/spf13/cobra"

"vitess.io/vitess/go/cmd/vtctldclient/cli"

topodatapb "vitess.io/vitess/go/vt/proto/topodata"
vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
)

func GetMirrorTrafficCommand(opts *SubCommandsOpts) *cobra.Command {
cmd := &cobra.Command{
Use: "mirrortraffic",
Short: fmt.Sprintf("Mirror traffic for a %s VReplication workflow.", opts.SubCommand),
Example: fmt.Sprintf(`vtctldclient --server localhost:15999 %s --workflow %s --target-keyspace customer mirrortraffic --percent 50.0`, opts.SubCommand, opts.Workflow),
DisableFlagsInUseLine: true,
Aliases: []string{"MirrorTraffic"},
Args: cobra.NoArgs,
PreRun: func(cmd *cobra.Command, args []string) {
if !cmd.Flags().Lookup("tablet-types").Changed {
// We mirror traffic for all tablet types if none are provided.
MirrorTrafficOptions.TabletTypes = []topodatapb.TabletType{
topodatapb.TabletType_PRIMARY,
topodatapb.TabletType_REPLICA,
topodatapb.TabletType_RDONLY,
}
}
},
RunE: commandMirrorTraffic,
}
return cmd
}

func commandMirrorTraffic(cmd *cobra.Command, args []string) error {
format, err := GetOutputFormat(cmd)
if err != nil {
return err
}

cli.FinishedParsing(cmd)

req := &vtctldatapb.WorkflowMirrorTrafficRequest{
Keyspace: BaseOptions.TargetKeyspace,
Workflow: BaseOptions.Workflow,
TabletTypes: MirrorTrafficOptions.TabletTypes,
Percent: MirrorTrafficOptions.Percent,
}
resp, err := GetClient().WorkflowMirrorTraffic(GetCommandCtx(), req)
if err != nil {
return err
}

var output []byte
if format == "json" {
output, err = cli.MarshalJSONPretty(resp)
if err != nil {
return err
}
} else {
tout := bytes.Buffer{}
tout.WriteString(resp.Summary + "\n\n")
tout.WriteString(fmt.Sprintf("Start State: %s\n", resp.StartState))
tout.WriteString(fmt.Sprintf("Current State: %s\n", resp.CurrentState))
output = tout.Bytes()
}
fmt.Printf("%s\n", output)

return nil
}
6 changes: 6 additions & 0 deletions go/cmd/vtctldclient/command/vreplication/common/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,12 @@ func AddCommonCreateFlags(cmd *cobra.Command) {
cmd.Flags().BoolVar(&CreateOptions.StopAfterCopy, "stop-after-copy", false, "Stop the workflow after it's finished copying the existing rows and before it starts replicating changes.")
}

var MirrorTrafficOptions = struct {
DryRun bool
Percent float32
TabletTypes []topodatapb.TabletType
}{}

var SwitchTrafficOptions = struct {
Cells []string
TabletTypes []topodatapb.TabletType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/spf13/cobra"

"vitess.io/vitess/go/cmd/vtctldclient/command/vreplication/common"
"vitess.io/vitess/go/vt/topo/topoproto"
)

var (
Expand Down Expand Up @@ -67,6 +68,11 @@ func registerCommands(root *cobra.Command) {
base.AddCommand(common.GetStartCommand(opts))
base.AddCommand(common.GetStopCommand(opts))

mirrorTrafficCommand := common.GetMirrorTrafficCommand(opts)
mirrorTrafficCommand.Flags().Var((*topoproto.TabletTypeListFlag)(&common.MirrorTrafficOptions.TabletTypes), "tablet-types", "Tablet types to mirror traffic for.")
mirrorTrafficCommand.Flags().Float32Var(&common.MirrorTrafficOptions.Percent, "percent", 1.0, "Percentage of traffic to mirror.")
base.AddCommand(mirrorTrafficCommand)

switchTrafficCommand := common.GetSwitchTrafficCommand(opts)
common.AddCommonSwitchTrafficFlags(switchTrafficCommand, true)
common.AddShardSubsetFlag(switchTrafficCommand, &common.SwitchTrafficOptions.Shards)
Expand Down
2 changes: 2 additions & 0 deletions go/flags/endtoend/vtctldclient.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Available Commands:
AddCellInfo Registers a local topology service in a new cell by creating the CellInfo.
AddCellsAlias Defines a group of cells that can be referenced by a single name (the alias).
ApplyKeyspaceRoutingRules Applies the provided keyspace routing rules.
ApplyMirrorRules Applies the VSchema mirror rules.
ApplyRoutingRules Applies the VSchema routing rules.
ApplySchema Applies the schema change to the specified keyspace on every primary, running in parallel on all shards. The changes are then propagated to replicas via replication.
ApplyShardRoutingRules Applies the provided shard routing rules.
Expand Down Expand Up @@ -42,6 +43,7 @@ Available Commands:
GetKeyspace Returns information about the given keyspace from the topology.
GetKeyspaceRoutingRules Displays the currently active keyspace routing rules.
GetKeyspaces Returns information about every keyspace in the topology.
GetMirrorRules Displays the VSchema mirror rules.
GetPermissions Displays the permissions for a tablet.
GetRoutingRules Displays the VSchema routing rules.
GetSchema Displays the full schema for a tablet, optionally restricted to the specified tables/views.
Expand Down
Loading

0 comments on commit 79983de

Please sign in to comment.