database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Bug#32025 ndb_waiter does too many roundtrips to ndb_mgmd

Browse Source 
- fix test failures that was already there but now are
   more consistent when the 1 second sleep has been removed from
   ndb_waiter
This commit is contained in:
msvensson@pilot.mysql.com
2008-02-21 13:23:58 +01:00
parent 71faa39360
commit c317562df4
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mysql-test/include/ndb_wait_connected.inc Normal file
View File

@ -0,0 +1,26 @@
# Check that mysqld has reconnected to ndbd after
# restart of ndbd
#
--disable_query_log
--disable_result_log
let $mysql_errno= 1;
let $counter= 600;
while ($mysql_errno)
{
--error 0,157
CREATE TABLE ndb_wait_connected (a int primary key);
if ($mysql_errno)
{
if (!$counter)
{
die Failed waiting for mysqld to reconnect to ndbd;
}
dec $counter;
--sleep 0.1
}
}
DROP TABLE ndb_wait_connected;
--enable_query_log
--enable_result_log

1
mysql-test/t/ndb_autodiscover.test
View File

@ -491,6 +491,7 @@ select * from t1;
select * from t1; select * from t1;
--exec $NDB_MGM --no-defaults -e "all start" > /dev/null --exec $NDB_MGM --no-defaults -e "all start" > /dev/null
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null
--source include/ndb_wait_connected.inc
use test; use test;
drop database test_only_ndb_tables; drop database test_only_ndb_tables;

9
mysql-test/t/ndb_autodiscover3.test
View File

@ -25,6 +25,13 @@ insert into t1 values (1);
--exec $NDB_MGM --no-defaults -e "all restart" >> $NDB_TOOLS_OUTPUT --exec $NDB_MGM --no-defaults -e "all restart" >> $NDB_TOOLS_OUTPUT
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
# Create separate connection and use that for detecting
# when mysqld has reconnected to ndbd
connect (ndb_wait_con,127.0.0.1,root,,test,$MASTER_MYPORT,);
--source include/ndb_wait_connected.inc
disconnect ndb_wait_con;
connection server1;
--error 1297 --error 1297
insert into t1 values (2); insert into t1 values (2);
--error 1296 --error 1296
@ -44,6 +51,7 @@ select * from t2 order by a limit 3;
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
--connection server2 --connection server2
--source include/ndb_wait_connected.inc
create table t2 (a int key) engine=ndbcluster; create table t2 (a int key) engine=ndbcluster;
insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
select * from t2 order by a limit 3; select * from t2 order by a limit 3;
@ -58,6 +66,7 @@ select * from t2 order by a limit 3;
--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults -c $connect_str >> $NDB_TOOLS_OUTPUT
--connection server1 --connection server1
--source include/ndb_wait_connected.inc
show tables; show tables;
create table t2 (a int key) engine=ndbcluster; create table t2 (a int key) engine=ndbcluster;
insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);