From b5ba79bb6d16da07358c48e7a082a36dfc6da14a Mon Sep 17 00:00:00 2001 From: Daniel Nichter Date: Tue, 14 Aug 2012 09:11:41 -0600 Subject: [PATCH] Collect df -k instead of df -h. Set log_error with abs path to fix failing t/lib/bash/collect.t test. --- bin/pt-stalk | 2 +- lib/bash/collect.sh | 2 +- sandbox/servers/4.1/my.sandbox.cnf | 2 +- sandbox/servers/5.0/my.sandbox.cnf | 2 +- sandbox/servers/5.1/my.sandbox.cnf | 2 +- sandbox/servers/5.5/my.sandbox.cnf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/pt-stalk b/bin/pt-stalk index e332a916..f92f8263 100755 --- a/bin/pt-stalk +++ b/bin/pt-stalk @@ -795,7 +795,7 @@ collect() { fi fi - (echo $ts; df -h) >> "$d/$p-df" & + (echo $ts; df -k) >> "$d/$p-df" & (echo $ts; netstat -antp) >> "$d/$p-netstat" & (echo $ts; netstat -s) >> "$d/$p-netstat_s" & diff --git a/lib/bash/collect.sh b/lib/bash/collect.sh index ef56a3ad..23640fec 100644 --- a/lib/bash/collect.sh +++ b/lib/bash/collect.sh @@ -218,7 +218,7 @@ collect() { fi fi - (echo $ts; df -h) >> "$d/$p-df" & + (echo $ts; df -k) >> "$d/$p-df" & (echo $ts; netstat -antp) >> "$d/$p-netstat" & (echo $ts; netstat -s) >> "$d/$p-netstat_s" & diff --git a/sandbox/servers/4.1/my.sandbox.cnf b/sandbox/servers/4.1/my.sandbox.cnf index 8d8c1074..9c85eabe 100644 --- a/sandbox/servers/4.1/my.sandbox.cnf +++ b/sandbox/servers/4.1/my.sandbox.cnf @@ -22,6 +22,6 @@ log_slave_updates server-id = PORT report-host = 127.0.0.1 report-port = PORT -log-error = mysqld.log +log-error = /tmp/PORT/data/mysqld.log innodb_lock_wait_timeout = 3 log diff --git a/sandbox/servers/5.0/my.sandbox.cnf b/sandbox/servers/5.0/my.sandbox.cnf index 858b9f62..eb00cea5 100644 --- a/sandbox/servers/5.0/my.sandbox.cnf +++ b/sandbox/servers/5.0/my.sandbox.cnf @@ -22,6 +22,6 @@ log_slave_updates server-id = PORT report-host = 127.0.0.1 report-port = PORT -log-error = mysqld.log +log-error = /tmp/PORT/data/mysqld.log innodb_lock_wait_timeout = 3 log = genlog diff --git a/sandbox/servers/5.1/my.sandbox.cnf b/sandbox/servers/5.1/my.sandbox.cnf index 858b9f62..eb00cea5 100644 --- a/sandbox/servers/5.1/my.sandbox.cnf +++ b/sandbox/servers/5.1/my.sandbox.cnf @@ -22,6 +22,6 @@ log_slave_updates server-id = PORT report-host = 127.0.0.1 report-port = PORT -log-error = mysqld.log +log-error = /tmp/PORT/data/mysqld.log innodb_lock_wait_timeout = 3 log = genlog diff --git a/sandbox/servers/5.5/my.sandbox.cnf b/sandbox/servers/5.5/my.sandbox.cnf index 967d5cf7..f47ab48d 100644 --- a/sandbox/servers/5.5/my.sandbox.cnf +++ b/sandbox/servers/5.5/my.sandbox.cnf @@ -22,7 +22,7 @@ log_slave_updates server-id = PORT report-host = 127.0.0.1 report-port = PORT -log-error = mysqld.log +log-error = /tmp/PORT/data/mysqld.log innodb_lock_wait_timeout = 3 general_log general_log_file = genlog