Skip to content

Commit

Permalink
resolved conflict
Browse files Browse the repository at this point in the history 
Signed-off-by: Shlomi Noach <[email protected]>
  • Loading branch information
@shlomi-noach
shlomi-noach committed Nov 26, 2023
2 parents 769053b + faf9815 commit 7995987
Show file tree
Hide file tree
Showing 256 changed files with 8,186 additions and 3,065 deletions.
40 changes: 40 additions & 0 deletions changelog/18.0/18.0.1/changelog.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Changelog of Vitess v18.0.1

### Bug fixes
#### Backup and Restore
* [release 18.0]: `ReadBinlogFilesTimestamps` backwards compatibility [#14526](https://github.com/vitessio/vitess/pull/14526)
#### Build/CI
* [release-18.0] Update create_release.sh (#14492) [#14516](https://github.com/vitessio/vitess/pull/14516)
#### Evalengine
* [release-18.0] Fix nullability checks in evalengine (#14556) [#14564](https://github.com/vitessio/vitess/pull/14564)
#### Examples
* [release-18.0] examples: fix flag syntax for zkctl (#14469) [#14487](https://github.com/vitessio/vitess/pull/14487)
#### Observability
* [release-18.0] Fix #14414: resilient_server metrics name/prefix logic is inverted, leading to no metrics being recorded (#14415) [#14527](https://github.com/vitessio/vitess/pull/14527)
#### Query Serving
* [release-18.0] Make column resolution closer to MySQL (#14426) [#14430](https://github.com/vitessio/vitess/pull/14430)
* [release-18.0] Bug fix: Use target tablet from health stats cache when checking replication status (#14436) [#14456](https://github.com/vitessio/vitess/pull/14456)
* [release-18.0] Ensure hexval and int don't share BindVar after Normalization (#14451) [#14479](https://github.com/vitessio/vitess/pull/14479)
* [release-18.0] planbuilder bugfix: expose columns through derived tables (#14501) [#14504](https://github.com/vitessio/vitess/pull/14504)
* [release-18.0] expression rewriting: enable more rewrites and limit CNF rewrites (#14560) [#14576](https://github.com/vitessio/vitess/pull/14576)
#### vtctldclient
* [release-18.0] vtctldclient: Apply tablet type filtering for keyspace+shard in GetTablets (#14467) [#14470](https://github.com/vitessio/vitess/pull/14470)
### CI/Build
#### Docker
* [release-18.0] Build and push Docker Images from GitHub Actions [#14511](https://github.com/vitessio/vitess/pull/14511)
### Dependabot
#### General
* [release-18.0] Bump google.golang.org/grpc from 1.55.0-dev to 1.59.0 (#14364) [#14498](https://github.com/vitessio/vitess/pull/14498)
### Documentation
#### Documentation
* [release-18.0] release notes: add FK import to summary (#14518) [#14519](https://github.com/vitessio/vitess/pull/14519)
### Internal Cleanup
#### Query Serving
* [release-18.0] Remove excessive VTGate logging of default planner selection (#14554) [#14561](https://github.com/vitessio/vitess/pull/14561)
### Release
#### General
* [release-18.0] Code Freeze for `v18.0.1` [#14549](https://github.com/vitessio/vitess/pull/14549)
### Testing
#### Query Serving
* [release-18.0] vtgate: Allow additional errors in warnings test (#14461) [#14465](https://github.com/vitessio/vitess/pull/14465)

7 changes: 7 additions & 0 deletions changelog/18.0/18.0.1/release_notes.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Release of Vitess v18.0.1
The entire changelog for this release can be found [here](https://github.com/vitessio/vitess/blob/main/changelog/18.0/18.0.1/changelog.md).

The release includes 17 merged Pull Requests.

Thanks to all our contributors: @app/vitess-bot, @frouioui, @harshit-gangal, @shlomi-noach

4 changes: 4 additions & 0 deletions changelog/18.0/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
## v18.0
* **[18.0.1](18.0.1)**
* [Changelog](18.0.1/changelog.md)
* [Release Notes](18.0.1/release_notes.md)

* **[18.0.0](18.0.0)**
* [Changelog](18.0.0/changelog.md)
* [Release Notes](18.0.0/release_notes.md)
3 changes: 3 additions & 0 deletions go/cmd/vtctldclient/command/vreplication/vdiff/vdiff.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ var (
Limit uint32 // We only accept positive values but pass on an int64
FilteredReplicationWaitTime time.Duration
DebugQuery bool
MaxReportSampleRows uint32 // We only accept positive values but pass on an int64
OnlyPKs bool
UpdateTableStats bool
MaxExtraRowsToCompare uint32 // We only accept positive values but pass on an int64
Expand Down Expand Up @@ -279,6 +280,7 @@ func commandCreate(cmd *cobra.Command, args []string) error {
Wait: createOptions.Wait,
WaitUpdateInterval: protoutil.DurationToProto(createOptions.WaitUpdateInterval),
AutoRetry: createOptions.AutoRetry,
MaxReportSampleRows: int64(createOptions.MaxReportSampleRows),
})

if err != nil {
Expand Down Expand Up @@ -863,6 +865,7 @@ func registerCommands(root *cobra.Command) {
create.Flags().DurationVar(&createOptions.FilteredReplicationWaitTime, "filtered-replication-wait-time", 30*time.Second, "Specifies the maximum time to wait, in seconds, for replication to catch up when syncing tablet streams.")
create.Flags().Uint32Var(&createOptions.Limit, "limit", math.MaxUint32, "Max rows to stop comparing after.")
create.Flags().BoolVar(&createOptions.DebugQuery, "debug-query", false, "Adds a mysql query to the report that can be used for further debugging.")
create.Flags().Uint32Var(&createOptions.MaxReportSampleRows, "max-report-sample-rows", 10, "Maximum number of row differences to report (0 for all differences). NOTE: when increasing this value it is highly recommended to also specify --only-pks")
create.Flags().BoolVar(&createOptions.OnlyPKs, "only-pks", false, "When reporting missing rows, only show primary keys in the report.")
create.Flags().StringSliceVar(&createOptions.Tables, "tables", nil, "Only run vdiff for these tables in the workflow.")
create.Flags().Uint32Var(&createOptions.MaxExtraRowsToCompare, "max-extra-rows-to-compare", 1000, "If there are collation differences between the source and target, you can have rows that are identical but simply returned in a different order from MySQL. We will do a second pass to compare the rows for any actual differences in this case and this flag allows you to control the resources used for this operation.")
Expand Down
271 changes: 271 additions & 0 deletions go/cmd/vtctldclient/command/vreplication/vdiff/vdiff_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,277 @@ func TestVDiffUnsharded(t *testing.T) {
}
}
]`),
}, {
id: "9", // --max-vdiff-report-rows=20 --only-pks
result: sqltypes.MakeTestResult(fields,
"completed||t1|"+UUID+"|completed|30|"+starttime+"|30|"+comptime+"|1|"+
`{"TableName": "t1", "MatchingRows": 10, "ProcessedRows": 30, "MismatchedRows": 20, "ExtraRowsSource": 0, `+
`"ExtraRowsTarget": 0, "MismatchedRowsSample": [`+
`{"Source": {"Row": {"c1": "2"}}, "Target": {"Row": {"c1": "2"}}},`+
`{"Source": {"Row": {"c1": "3"}}, "Target": {"Row": {"c1": "3"}}},`+
`{"Source": {"Row": {"c1": "4"}}, "Target": {"Row": {"c1": "4"}}},`+
`{"Source": {"Row": {"c1": "5"}}, "Target": {"Row": {"c1": "5"}}},`+
`{"Source": {"Row": {"c1": "6"}}, "Target": {"Row": {"c1": "6"}}},`+
`{"Source": {"Row": {"c1": "7"}}, "Target": {"Row": {"c1": "7"}}},`+
`{"Source": {"Row": {"c1": "8"}}, "Target": {"Row": {"c1": "8"}}},`+
`{"Source": {"Row": {"c1": "9"}}, "Target": {"Row": {"c1": "9"}}},`+
`{"Source": {"Row": {"c1": "10"}}, "Target": {"Row": {"c1": "10"}}},`+
`{"Source": {"Row": {"c1": "11"}}, "Target": {"Row": {"c1": "11"}}},`+
`{"Source": {"Row": {"c1": "12"}}, "Target": {"Row": {"c1": "12"}}},`+
`{"Source": {"Row": {"c1": "13"}}, "Target": {"Row": {"c1": "13"}}},`+
`{"Source": {"Row": {"c1": "14"}}, "Target": {"Row": {"c1": "14"}}},`+
`{"Source": {"Row": {"c1": "15"}}, "Target": {"Row": {"c1": "15"}}},`+
`{"Source": {"Row": {"c1": "16"}}, "Target": {"Row": {"c1": "16"}}},`+
`{"Source": {"Row": {"c1": "17"}}, "Target": {"Row": {"c1": "17"}}},`+
`{"Source": {"Row": {"c1": "18"}}, "Target": {"Row": {"c1": "18"}}},`+
`{"Source": {"Row": {"c1": "19"}}, "Target": {"Row": {"c1": "19"}}},`+
`{"Source": {"Row": {"c1": "20"}}, "Target": {"Row": {"c1": "20"}}},`+
`{"Source": {"Row": {"c1": "21"}}, "Target": {"Row": {"c1": "21"}}}`+
`]}`),
report: fmt.Sprintf(badReportfmt,
env.targetKeyspace, UUID, 30, true, starttime, comptime, 30, 10, 20, 0, 0, 30, 10, 20, 0, 0,
`"MismatchedRowsSample": [
{
"Source": {
"Row": {
"c1": "2"
}
},
"Target": {
"Row": {
"c1": "2"
}
}
},
{
"Source": {
"Row": {
"c1": "3"
}
},
"Target": {
"Row": {
"c1": "3"
}
}
},
{
"Source": {
"Row": {
"c1": "4"
}
},
"Target": {
"Row": {
"c1": "4"
}
}
},
{
"Source": {
"Row": {
"c1": "5"
}
},
"Target": {
"Row": {
"c1": "5"
}
}
},
{
"Source": {
"Row": {
"c1": "6"
}
},
"Target": {
"Row": {
"c1": "6"
}
}
},
{
"Source": {
"Row": {
"c1": "7"
}
},
"Target": {
"Row": {
"c1": "7"
}
}
},
{
"Source": {
"Row": {
"c1": "8"
}
},
"Target": {
"Row": {
"c1": "8"
}
}
},
{
"Source": {
"Row": {
"c1": "9"
}
},
"Target": {
"Row": {
"c1": "9"
}
}
},
{
"Source": {
"Row": {
"c1": "10"
}
},
"Target": {
"Row": {
"c1": "10"
}
}
},
{
"Source": {
"Row": {
"c1": "11"
}
},
"Target": {
"Row": {
"c1": "11"
}
}
},
{
"Source": {
"Row": {
"c1": "12"
}
},
"Target": {
"Row": {
"c1": "12"
}
}
},
{
"Source": {
"Row": {
"c1": "13"
}
},
"Target": {
"Row": {
"c1": "13"
}
}
},
{
"Source": {
"Row": {
"c1": "14"
}
},
"Target": {
"Row": {
"c1": "14"
}
}
},
{
"Source": {
"Row": {
"c1": "15"
}
},
"Target": {
"Row": {
"c1": "15"
}
}
},
{
"Source": {
"Row": {
"c1": "16"
}
},
"Target": {
"Row": {
"c1": "16"
}
}
},
{
"Source": {
"Row": {
"c1": "17"
}
},
"Target": {
"Row": {
"c1": "17"
}
}
},
{
"Source": {
"Row": {
"c1": "18"
}
},
"Target": {
"Row": {
"c1": "18"
}
}
},
{
"Source": {
"Row": {
"c1": "19"
}
},
"Target": {
"Row": {
"c1": "19"
}
}
},
{
"Source": {
"Row": {
"c1": "20"
}
},
"Target": {
"Row": {
"c1": "20"
}
}
},
{
"Source": {
"Row": {
"c1": "21"
}
},
"Target": {
"Row": {
"c1": "21"
}
}
}
]`),
},
}

Expand Down
4 changes: 2 additions & 2 deletions go/flags/endtoend/vtcombo.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ Flags:
--stream_buffer_size int the number of bytes sent from vtgate for each stream call. It's recommended to keep this value in sync with vttablet's query-server-config-stream-buffer-size. (default 32768)
--stream_health_buffer_size uint max streaming health entries to buffer per streaming health client (default 20)
--table-refresh-interval int interval in milliseconds to refresh tables in status page with refreshRequired class
--table_gc_lifecycle string States for a DROP TABLE garbage collection cycle. Default is 'hold,purge,evac,drop', use any subset ('drop' implcitly always included) (default "hold,purge,evac,drop")
--table_gc_lifecycle string States for a DROP TABLE garbage collection cycle. Default is 'hold,purge,evac,drop', use any subset ('drop' implicitly always included) (default "hold,purge,evac,drop")
--tablet_dir string The directory within the vtdataroot to store vttablet/mysql files. Defaults to being generated by the tablet uid.
--tablet_filters strings Specifies a comma-separated list of 'keyspace|shard_name or keyrange' values to filter the tablets to watch.
--tablet_health_keep_alive duration close streaming tablet health connection if there are no requests for this long (default 5m0s)
Expand All @@ -349,7 +349,7 @@ Flags:
--tablet_refresh_interval duration Tablet refresh interval. (default 1m0s)
--tablet_refresh_known_tablets Whether to reload the tablet's address/port map from topo in case they change. (default true)
--tablet_url_template string Format string describing debug tablet url formatting. See getTabletDebugURL() for how to customize this. (default "http://{{ "{{.GetTabletHostPort}}" }}")
--throttle_tablet_types string Comma separated VTTablet types to be considered by the throttler. default: 'replica'. example: 'replica,rdonly'. 'replica' aways implicitly included (default "replica")
--throttle_tablet_types string Comma separated VTTablet types to be considered by the throttler. default: 'replica'. example: 'replica,rdonly'. 'replica' always implicitly included (default "replica")
--topo_consul_lock_delay duration LockDelay for consul session. (default 15s)
--topo_consul_lock_session_checks string List of checks for consul session. (default "serfHealth")
--topo_consul_lock_session_ttl string TTL for consul session.
Expand Down
4 changes: 2 additions & 2 deletions go/flags/endtoend/vttablet.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ Flags:
--table-acl-config string path to table access checker config file; send SIGHUP to reload this file
--table-acl-config-reload-interval duration Ticker to reload ACLs. Duration flag, format e.g.: 30s. Default: do not reload
--table-refresh-interval int interval in milliseconds to refresh tables in status page with refreshRequired class
--table_gc_lifecycle string States for a DROP TABLE garbage collection cycle. Default is 'hold,purge,evac,drop', use any subset ('drop' implcitly always included) (default "hold,purge,evac,drop")
--table_gc_lifecycle string States for a DROP TABLE garbage collection cycle. Default is 'hold,purge,evac,drop', use any subset ('drop' implicitly always included) (default "hold,purge,evac,drop")
--tablet-path string tablet alias
--tablet_config string YAML file config for tablet
--tablet_dir string The directory within the vtdataroot to store vttablet/mysql files. Defaults to being generated by the tablet uid.
Expand All @@ -355,7 +355,7 @@ Flags:
--tablet_manager_grpc_server_name string the server name to use to validate server certificate
--tablet_manager_protocol string Protocol to use to make tabletmanager RPCs to vttablets. (default "grpc")
--tablet_protocol string Protocol to use to make queryservice RPCs to vttablets. (default "grpc")
--throttle_tablet_types string Comma separated VTTablet types to be considered by the throttler. default: 'replica'. example: 'replica,rdonly'. 'replica' aways implicitly included (default "replica")
--throttle_tablet_types string Comma separated VTTablet types to be considered by the throttler. default: 'replica'. example: 'replica,rdonly'. 'replica' always implicitly included (default "replica")
--topo_consul_lock_delay duration LockDelay for consul session. (default 15s)
--topo_consul_lock_session_checks string List of checks for consul session. (default "serfHealth")
--topo_consul_lock_session_ttl string TTL for consul session.
Expand Down
Loading

0 comments on commit 7995987

Please sign in to comment.