Skip to content

Commit 4299951

Browse files
authored
Remove binlog-server point in time recoveries code & tests (#17361)
Signed-off-by: Shlomi Noach <[email protected]>
1 parent 56b5c2a commit 4299951

File tree

9 files changed

+5
-994
lines changed

9 files changed

+5
-994
lines changed

go/flags/endtoend/vtcombo.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,7 @@ Flags:
2222
--backup_storage_number_blocks int if backup_storage_compress is true, backup_storage_number_blocks sets the number of blocks that can be processed, in parallel, before the writer blocks, during compression (default is 2). It should be equal to the number of CPUs available for compression. (default 2)
2323
--bind-address string Bind address for the server. If empty, the server will listen on all available unicast and anycast IP addresses of the local system.
2424
--binlog-in-memory-decompressor-max-size uint This value sets the uncompressed transaction payload size at which we switch from in-memory buffer based decompression to the slower streaming mode. (default 134217728)
25-
--binlog_host string PITR restore parameter: hostname/IP of binlog server.
26-
--binlog_password string PITR restore parameter: password of binlog server.
2725
--binlog_player_protocol string the protocol to download binlogs from a vttablet (default "grpc")
28-
--binlog_port int PITR restore parameter: port of binlog server.
29-
--binlog_ssl_ca string PITR restore parameter: Filename containing TLS CA certificate to verify binlog server TLS certificate against.
30-
--binlog_ssl_cert string PITR restore parameter: Filename containing mTLS client certificate to present to binlog server as authentication.
31-
--binlog_ssl_key string PITR restore parameter: Filename containing mTLS client private key for use in binlog server authentication.
32-
--binlog_ssl_server_name string PITR restore parameter: TLS server name (common name) to verify against for the binlog server we are connecting to (If not set: use the hostname or IP supplied in --binlog_host).
33-
--binlog_user string PITR restore parameter: username of binlog server.
3426
--buffer_drain_concurrency int Maximum number of requests retried simultaneously. More concurrency will increase the load on the PRIMARY vttablet when draining the buffer. (default 1)
3527
--buffer_keyspace_shards string If not empty, limit buffering to these entries (comma separated). Entry format: keyspace or keyspace/shard. Requires --enable_buffer=true.
3628
--buffer_max_failover_duration duration Stop buffering completely if a failover takes longer than this duration. (default 20s)
@@ -261,7 +253,6 @@ Flags:
261253
--onclose_timeout duration wait no more than this for OnClose handlers before stopping (default 10s)
262254
--onterm_timeout duration wait no more than this for OnTermSync handlers before stopping (default 10s)
263255
--pid_file string If set, the process will write its pid to the named file, and delete it on graceful shutdown.
264-
--pitr_gtid_lookup_timeout duration PITR restore parameter: timeout for fetching gtid from timestamp. (default 1m0s)
265256
--planner-version string Sets the default planner to use when the session has not changed it. Valid values are: Gen4, Gen4Greedy, Gen4Left2Right
266257
--pool_hostname_resolve_interval duration if set force an update to all hostnames and reconnect if changed, defaults to 0 (disabled)
267258
--port int port for the server

go/flags/endtoend/vttablet.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,12 @@ Flags:
5757
--backup_storage_number_blocks int if backup_storage_compress is true, backup_storage_number_blocks sets the number of blocks that can be processed, in parallel, before the writer blocks, during compression (default is 2). It should be equal to the number of CPUs available for compression. (default 2)
5858
--bind-address string Bind address for the server. If empty, the server will listen on all available unicast and anycast IP addresses of the local system.
5959
--binlog-in-memory-decompressor-max-size uint This value sets the uncompressed transaction payload size at which we switch from in-memory buffer based decompression to the slower streaming mode. (default 134217728)
60-
--binlog_host string PITR restore parameter: hostname/IP of binlog server.
61-
--binlog_password string PITR restore parameter: password of binlog server.
6260
--binlog_player_grpc_ca string the server ca to use to validate servers when connecting
6361
--binlog_player_grpc_cert string the cert to use to connect
6462
--binlog_player_grpc_crl string the server crl to use to validate server certificates when connecting
6563
--binlog_player_grpc_key string the key to use to connect
6664
--binlog_player_grpc_server_name string the server name to use to validate server certificate
6765
--binlog_player_protocol string the protocol to download binlogs from a vttablet (default "grpc")
68-
--binlog_port int PITR restore parameter: port of binlog server.
69-
--binlog_ssl_ca string PITR restore parameter: Filename containing TLS CA certificate to verify binlog server TLS certificate against.
70-
--binlog_ssl_cert string PITR restore parameter: Filename containing mTLS client certificate to present to binlog server as authentication.
71-
--binlog_ssl_key string PITR restore parameter: Filename containing mTLS client private key for use in binlog server authentication.
72-
--binlog_ssl_server_name string PITR restore parameter: TLS server name (common name) to verify against for the binlog server we are connecting to (If not set: use the hostname or IP supplied in --binlog_host).
73-
--binlog_user string PITR restore parameter: username of binlog server.
7466
--builtinbackup-file-read-buffer-size uint read files using an IO buffer of this many bytes. Golang defaults are used when set to 0.
7567
--builtinbackup-file-write-buffer-size uint write files using an IO buffer of this many bytes. Golang defaults are used when set to 0. (default 2097152)
7668
--builtinbackup-incremental-restore-path string the directory where incremental restore files, namely binlog files, are extracted to. In k8s environments, this should be set to a directory that is shared between the vttablet and mysqld pods. The path should exist. When empty, the default OS temp dir is assumed.
@@ -259,7 +251,6 @@ Flags:
259251
--onterm_timeout duration wait no more than this for OnTermSync handlers before stopping (default 10s)
260252
--opentsdb_uri string URI of opentsdb /api/put method
261253
--pid_file string If set, the process will write its pid to the named file, and delete it on graceful shutdown.
262-
--pitr_gtid_lookup_timeout duration PITR restore parameter: timeout for fetching gtid from timestamp. (default 1m0s)
263254
--pool_hostname_resolve_interval duration if set force an update to all hostnames and reconnect if changed, defaults to 0 (disabled)
264255
--port int port for the server
265256
--pprof strings enable profiling

go/mysql/flavor_filepos.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (flv *filePosFlavor) gtidMode(c *Conn) (string, error) {
8484

8585
// serverUUID is part of the Flavor interface.
8686
func (flv *filePosFlavor) serverUUID(c *Conn) (string, error) {
87-
// keep @@global as lowercase, as some servers like the Ripple binlog server only honors a lowercase `global` value
87+
// keep @@global as lowercase, as some servers like a binlog server only honors a lowercase `global` value
8888
qr, err := c.ExecuteFetch("SELECT @@global.server_uuid", 1, false)
8989
if err != nil {
9090
return "", err

go/mysql/flavor_mysql.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ var _ flavor = (*mysqlFlavor82)(nil)
6060

6161
// primaryGTIDSet is part of the Flavor interface.
6262
func (mysqlFlavor) primaryGTIDSet(c *Conn) (replication.GTIDSet, error) {
63-
// keep @@global as lowercase, as some servers like the Ripple binlog server only honors a lowercase `global` value
63+
// keep @@global as lowercase, as some servers like a binlog server only honors a lowercase `global` value
6464
qr, err := c.ExecuteFetch("SELECT @@global.gtid_executed", 1, false)
6565
if err != nil {
6666
return nil, err
@@ -73,7 +73,7 @@ func (mysqlFlavor) primaryGTIDSet(c *Conn) (replication.GTIDSet, error) {
7373

7474
// purgedGTIDSet is part of the Flavor interface.
7575
func (mysqlFlavor) purgedGTIDSet(c *Conn) (replication.GTIDSet, error) {
76-
// keep @@global as lowercase, as some servers like the Ripple binlog server only honors a lowercase `global` value
76+
// keep @@global as lowercase, as some servers like a binlog server only honors a lowercase `global` value
7777
qr, err := c.ExecuteFetch("SELECT @@global.gtid_purged", 1, false)
7878
if err != nil {
7979
return nil, err
@@ -86,7 +86,7 @@ func (mysqlFlavor) purgedGTIDSet(c *Conn) (replication.GTIDSet, error) {
8686

8787
// serverUUID is part of the Flavor interface.
8888
func (mysqlFlavor) serverUUID(c *Conn) (string, error) {
89-
// keep @@global as lowercase, as some servers like the Ripple binlog server only honors a lowercase `global` value
89+
// keep @@global as lowercase, as some servers like a binlog server only honors a lowercase `global` value
9090
qr, err := c.ExecuteFetch("SELECT @@global.server_uuid", 1, false)
9191
if err != nil {
9292
return "", err

go/test/endtoend/recovery/pitr/binlog_server.go

Lines changed: 0 additions & 137 deletions
This file was deleted.

0 commit comments

Comments
 (0)