Commit ea810b04 authored by Daniel Black's avatar Daniel Black

MDEV-30676 rpl.parallel_backup* tests sometimes fail

Raise innodb_lock_wait_timeout from 1 to 5
parent 8bc32410
...@@ -124,7 +124,7 @@ include/save_master_gtid.inc ...@@ -124,7 +124,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;
...@@ -167,7 +167,7 @@ include/save_master_gtid.inc ...@@ -167,7 +167,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;
......
...@@ -127,7 +127,7 @@ include/save_master_gtid.inc ...@@ -127,7 +127,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;
...@@ -170,7 +170,7 @@ include/save_master_gtid.inc ...@@ -170,7 +170,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;
......
...@@ -127,7 +127,7 @@ include/save_master_gtid.inc ...@@ -127,7 +127,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;
...@@ -170,7 +170,7 @@ include/save_master_gtid.inc ...@@ -170,7 +170,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;
......
...@@ -41,7 +41,7 @@ if ($slave_ooo_error) ...@@ -41,7 +41,7 @@ if ($slave_ooo_error)
{ {
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
} }
--source include/start_slave.inc --source include/start_slave.inc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment