diff --git a/go/flags/endtoend/flags_test.go b/go/flags/endtoend/flags_test.go index c1e244f5f70..6ce5b0274a1 100644 --- a/go/flags/endtoend/flags_test.go +++ b/go/flags/endtoend/flags_test.go @@ -29,8 +29,6 @@ import ( "text/template" "github.com/stretchr/testify/require" - - "vitess.io/vitess/go/test/utils" ) var ( @@ -138,7 +136,7 @@ func TestHelpOutput(t *testing.T) { cmd.Stdout = &output err = cmd.Run() require.NoError(t, err) - utils.MustMatch(t, buf.String(), output.String()) + require.Equal(t, buf.String(), output.String()) }) } } diff --git a/go/flags/endtoend/vtcombo.txt b/go/flags/endtoend/vtcombo.txt index 45ca4ee2a08..9d947b93beb 100644 --- a/go/flags/endtoend/vtcombo.txt +++ b/go/flags/endtoend/vtcombo.txt @@ -410,6 +410,7 @@ Flags: --vreplication_copy_phase_duration duration Duration for each copy phase loop (before running the next catchup: default 1h) (default 1h0m0s) --vreplication_copy_phase_max_innodb_history_list_length int The maximum InnoDB transaction history that can exist on a vstreamer (source) before starting another round of copying rows. This helps to limit the impact on the source tablet. (default 1000000) --vreplication_copy_phase_max_mysql_replication_lag int The maximum MySQL replication lag (in seconds) that can exist on a vstreamer (source) before starting another round of copying rows. This helps to limit the impact on the source tablet. (default 43200) + --vreplication_enable_http_log Enable the /debug/vrlog HTTP endpoint, which will produce a log of the queries executed on primary tablets in the target keyspace by all VReplication workflows that are in the running/replicating phase. --vreplication_experimental_flags int (Bitmask) of experimental features in vreplication to enable (default 7) --vreplication_heartbeat_update_interval int Frequency (in seconds, default 1, max 60) at which the time_updated column of a vreplication stream when idling (default 1) --vreplication_max_time_to_retry_on_error duration stop automatically retrying when we've had consecutive failures with the same error for this long after the first occurrence diff --git a/go/flags/endtoend/vttablet.txt b/go/flags/endtoend/vttablet.txt index a463db305ba..ef817ffaab4 100644 --- a/go/flags/endtoend/vttablet.txt +++ b/go/flags/endtoend/vttablet.txt @@ -412,6 +412,7 @@ Flags: --vreplication_copy_phase_duration duration Duration for each copy phase loop (before running the next catchup: default 1h) (default 1h0m0s) --vreplication_copy_phase_max_innodb_history_list_length int The maximum InnoDB transaction history that can exist on a vstreamer (source) before starting another round of copying rows. This helps to limit the impact on the source tablet. (default 1000000) --vreplication_copy_phase_max_mysql_replication_lag int The maximum MySQL replication lag (in seconds) that can exist on a vstreamer (source) before starting another round of copying rows. This helps to limit the impact on the source tablet. (default 43200) + --vreplication_enable_http_log Enable the /debug/vrlog HTTP endpoint, which will produce a log of the queries executed on primary tablets in the target keyspace by all VReplication workflows that are in the running/replicating phase. --vreplication_experimental_flags int (Bitmask) of experimental features in vreplication to enable (default 7) --vreplication_heartbeat_update_interval int Frequency (in seconds, default 1, max 60) at which the time_updated column of a vreplication stream when idling (default 1) --vreplication_max_time_to_retry_on_error duration stop automatically retrying when we've had consecutive failures with the same error for this long after the first occurrence diff --git a/go/vt/vttablet/common/flags.go b/go/vt/vttablet/common/flags.go index 27912ae5c8b..e2755435fae 100644 --- a/go/vt/vttablet/common/flags.go +++ b/go/vt/vttablet/common/flags.go @@ -100,5 +100,5 @@ func registerFlags(fs *pflag.FlagSet) { fs.Uint64Var(&mysql.ZstdInMemoryDecompressorMaxSize, "binlog-in-memory-decompressor-max-size", mysql.ZstdInMemoryDecompressorMaxSize, "This value sets the uncompressed transaction payload size at which we switch from in-memory buffer based decompression to the slower streaming mode.") - fs.BoolVar(&vreplicationEnableHttpLog, "vreplication_enable_http_log", vreplicationEnableHttpLog, "Enable the /debug/vrlog HTTP endpoint, which will produce a log of the queries executed on the target keyspace primary tablets for all workflows.") + fs.BoolVar(&vreplicationEnableHttpLog, "vreplication_enable_http_log", vreplicationEnableHttpLog, "Enable the /debug/vrlog HTTP endpoint, which will produce a log of the queries executed on primary tablets in the target keyspace by all VReplication workflows that are in the running/replicating phase.") } diff --git a/go/vt/vttablet/tabletmanager/vreplication/vrlog.go b/go/vt/vttablet/tabletmanager/vreplication/vrlog.go index 0637c036183..3b98741b2c2 100644 --- a/go/vt/vttablet/tabletmanager/vreplication/vrlog.go +++ b/go/vt/vttablet/tabletmanager/vreplication/vrlog.go @@ -46,7 +46,6 @@ type VrLogStats struct { DurationNs int64 } -// NewVrLogStats should be called at the start of the event to be logged func NewVrLogStats(eventType string, startTime time.Time) *VrLogStats { return &VrLogStats{Type: eventType, StartTime: startTime} }