percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-26 15:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sandbox servers log their actions, remove test-env reset from pt-table-checksum/basics.t to stop replication breakage

Browse Source
This commit is contained in:
Baron Schwartz
2012-06-06 00:57:19 -04:00
parent 48677eb4d1
commit 1a40d1301f
6 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sandbox/servers/4.1/my.sandbox.cnf
View File

@@ -24,3 +24,4 @@ report-host = 127.0.0.1
report-port = PORT report-port = PORT
log-error = mysqld.log log-error = mysqld.log
innodb_lock_wait_timeout = 3 innodb_lock_wait_timeout = 3
log

1
sandbox/servers/5.0/my.sandbox.cnf
View File

@@ -24,3 +24,4 @@ report-host = 127.0.0.1
report-port = PORT report-port = PORT
log-error = mysqld.log log-error = mysqld.log
innodb_lock_wait_timeout = 3 innodb_lock_wait_timeout = 3
log

1
sandbox/servers/5.1/my.sandbox.cnf
View File

@@ -24,3 +24,4 @@ report-host = 127.0.0.1
report-port = PORT report-port = PORT
log-error = mysqld.log log-error = mysqld.log
innodb_lock_wait_timeout = 3 innodb_lock_wait_timeout = 3
log

1
sandbox/servers/5.5/my.sandbox.cnf
View File

@@ -24,3 +24,4 @@ report-host = 127.0.0.1
report-port = PORT report-port = PORT
log-error = mysqld.log log-error = mysqld.log
innodb_lock_wait_timeout = 3 innodb_lock_wait_timeout = 3
general_log

1
sandbox/test-env
View File

@@ -340,6 +340,7 @@ case $opt in
# don't replicate to new sandbox servers. This makes creating new # don't replicate to new sandbox servers. This makes creating new
# sandbox servers a lot faster. There's no check if this works or # sandbox servers a lot faster. There's no check if this works or
# not, so... yeah. # not, so... yeah.
echo "RESETTING SLAVE. This is DANGEROUS and DOESN'T WORK. FIXME." >&2
/tmp/12347/use -e "STOP SLAVE; FLUSH SLAVE;" /tmp/12347/use -e "STOP SLAVE; FLUSH SLAVE;"
/tmp/12346/use -e "STOP SLAVE; FLUSH SLAVE; FLUSH MASTER;" /tmp/12346/use -e "STOP SLAVE; FLUSH SLAVE; FLUSH MASTER;"
/tmp/12345/use -e "FLUSH MASTER" /tmp/12345/use -e "FLUSH MASTER"

4
t/pt-table-checksum/basics.t
View File

@@ -62,10 +62,6 @@ sub reset_repl_db {
$master_dbh->do("use $repl_db"); $master_dbh->do("use $repl_db");
} }
diag(`$trunk/sandbox/test-env reset >/dev/null`);
$sb->wipe_clean($master_dbh);
diag(`rm $outfile >/dev/null 2>&1`);
# ############################################################################ # ############################################################################
# Default checksum and results. The tool does not technically require any # Default checksum and results. The tool does not technically require any
# options on well-configured systems (which the test env cannot be). With # options on well-configured systems (which the test env cannot be). With