mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
BUG#13812374 - RPL.RPL_REPORT_PORT FAILS OCCASIONALLY ON PB2
Fix - Changed the implementation of the condition check from the result file to using an assert.
This commit is contained in:
parent
cd0cefc4ff
commit
aaead0efb4
2 changed files with 11 additions and 28 deletions
|
@ -1,15 +1,8 @@
|
|||
include/master-slave.inc
|
||||
[connection master]
|
||||
[The default value shown for the slave's port number is the actual port number of the slave]
|
||||
SHOW SLAVE HOSTS;
|
||||
Server_id Host Port Master_id
|
||||
2 127.0.0.1 SLAVE_PORT 1
|
||||
[The default value shown for the slave's port number is the actual port number of the slave]
|
||||
include/assert.inc [The default value shown for the slave's port number is the actual port number of the slave.]
|
||||
include/rpl_restart_server.inc [server_number=2 parameters: --report-port=9000]
|
||||
include/start_slave.inc
|
||||
[Slave restarted with the report-port set to some value]
|
||||
[The value shown for the slave's port number is 9000 which is the value set for report-port]
|
||||
SHOW SLAVE HOSTS;
|
||||
Server_id Host Port Master_id
|
||||
2 127.0.0.1 9000 1
|
||||
include/assert.inc [The value shown for the slave's port number is 9000 which is the value set for report-port.]
|
||||
include/rpl_end.inc
|
||||
|
|
|
@ -21,16 +21,10 @@ source include/master-slave.inc;
|
|||
|
||||
connection master;
|
||||
|
||||
--echo [The default value shown for the slave's port number is the actual port number of the slave]
|
||||
source include/show_slave_hosts.inc;
|
||||
|
||||
# SLAVE_PORT is the value of the port we should get.
|
||||
|
||||
let $show_statement= SHOW SLAVE HOSTS;
|
||||
let $field= Port;
|
||||
let $condition= 'SLAVE_PORT';
|
||||
source include/wait_show_condition.inc;
|
||||
--echo [The default value shown for the slave's port number is the actual port number of the slave]
|
||||
--let $report_port= query_get_value(SHOW SLAVE HOSTS, Port, 1)
|
||||
--let assert_text= The default value shown for the slave's port number is the actual port number of the slave.
|
||||
--let assert_cond= $report_port = "$SLAVE_MYPORT"
|
||||
--source include/assert.inc
|
||||
|
||||
# Start the server with some value being passed to the report_port= <option>
|
||||
# this will be used incase we have to mask the value of the slave's port
|
||||
|
@ -46,14 +40,10 @@ connection slave;
|
|||
--echo [Slave restarted with the report-port set to some value]
|
||||
connection master;
|
||||
|
||||
--echo [The value shown for the slave's port number is 9000 which is the value set for report-port]
|
||||
--source include/show_slave_hosts.inc
|
||||
|
||||
# 9000 is the value of the port we should get.
|
||||
|
||||
let $show_statement= SHOW SLAVE HOSTS;
|
||||
let $field= Port;
|
||||
let $condition= '9000';
|
||||
source include/wait_show_condition.inc;
|
||||
--let $report_port= query_get_value(SHOW SLAVE HOSTS, Port, 1)
|
||||
--let assert_text= The value shown for the slave's port number is 9000 which is the value set for report-port.
|
||||
--let assert_cond= $report_port = "9000"
|
||||
--source include/assert.inc
|
||||
|
||||
--source include/rpl_end.inc
|
||||
|
|
Loading…
Add table
Reference in a new issue