percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up a couple of things causing tests to fail for me, and remove a feature that's not quite ready yet, and add another feature for innodb compression

Browse Source
This commit is contained in:
baron
2012-03-30 17:04:25 -04:00
parent 6e9a483ee1
commit d44e8b539b
8 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/pt-mysql-summary
View File

@@ -700,20 +700,20 @@ has_symbols () {
}
setup_data_dir () {
local OPT_SAVE_DATA="$1"
local existing_dir="$1"
local data_dir=""
if [ -z "$OPT_SAVE_DATA" ]; then
if [ -z "$existing_dir" ]; then
mkdir "$TMPDIR/data" || die "Cannot mkdir $TMPDIR/data"
data_dir="$TMPDIR/data"
else
if [ ! -d "$OPT_SAVE_DATA" ]; then
mkdir "$OPT_SAVE_DATA" || die "Cannot mkdir $OPT_SAVE_DATA"
elif [ "$( ls "$OPT_SAVE_DATA" )" != "0" ]; then
if [ ! -d "$existing_dir" ]; then
mkdir "$existing_dir" || die "Cannot mkdir $existing_dir"
elif [ "$( ls -A "$existing_dir" )" ]; then
die "--save-samples directory isn't empty, halting."
fi
touch "$OPT_SAVE_DATA/test" || die "Cannot write to $OPT_SAVE_DATA"
rm "$OPT_SAVE_DATA/test" || die "Cannot rm $OPT_SAVE_DATA/test"
data_dir="$OPT_SAVE_DATA"
touch "$existing_dir/test" || die "Cannot write to $existing_dir"
rm "$existing_dir/test" || die "Cannot rm $existing_dir/test"
data_dir="$existing_dir"
fi
echo "$data_dir"
}

6
lib/bash/report_mysql_info.sh
View File

@@ -1058,9 +1058,9 @@ report_mysql_summary () {
section Instances
parse_mysqld_instances "$dir/mysqld-instances" "$dir/mysql-variables"
section MySQL_Executable
name_val "Path to executable" "$( get_var pt-summary-internal-mysql_executable "$dir/mysql-variables" )"
name_val "Has symbols" "$( get_var "pt-summary-internal-symbols" "$dir/mysql-variables" )"
# TODO section MySQL_Executable
# TODO name_val "Path to executable" "$( get_var pt-summary-internal-mysql_executable "$dir/mysql-variables" )"
# TODO name_val "Has symbols" "$( get_var "pt-summary-internal-symbols" "$dir/mysql-variables" )"
# ########################################################################
# General date, hostname, etc

16
lib/bash/summary_common.sh
View File

@@ -123,22 +123,22 @@ has_symbols () {
}
setup_data_dir () {
local OPT_SAVE_DATA="$1"
local existing_dir="$1"
local data_dir=""
if [ -z "$OPT_SAVE_DATA" ]; then
if [ -z "$existing_dir" ]; then
# User didn't specify a --save-data dir, so use a sub-dir in our tmpdir.
mkdir "$TMPDIR/data" || die "Cannot mkdir $TMPDIR/data"
data_dir="$TMPDIR/data"
else
# Check the user's --save-data dir.
if [ ! -d "$OPT_SAVE_DATA" ]; then
mkdir "$OPT_SAVE_DATA" || die "Cannot mkdir $OPT_SAVE_DATA"
elif [ "$( ls "$OPT_SAVE_DATA" )" != "0" ]; then
if [ ! -d "$existing_dir" ]; then
mkdir "$existing_dir" || die "Cannot mkdir $existing_dir"
elif [ "$( ls -A "$existing_dir" )" ]; then
die "--save-samples directory isn't empty, halting."
fi
touch "$OPT_SAVE_DATA/test" || die "Cannot write to $OPT_SAVE_DATA"
rm "$OPT_SAVE_DATA/test" || die "Cannot rm $OPT_SAVE_DATA/test"
data_dir="$OPT_SAVE_DATA"
touch "$existing_dir/test" || die "Cannot write to $existing_dir"
rm "$existing_dir/test" || die "Cannot rm $existing_dir/test"
data_dir="$existing_dir"
fi
echo "$data_dir"
}

2
t/pt-deadlock-logger/basics.t
View File

@@ -81,7 +81,7 @@ foreach my $child ( keys %children ) {
}
# Test that there is a deadlock
$output = $dbh1->selectrow_hashref('show innodb status')->{status};
$output = $dbh1->selectrow_hashref('show /*!40101 engine*/ innodb status')->{status};
like($output, qr/WE ROLL BACK/, 'There was a deadlock');
$output = `$cmd --print`;

8
t/pt-mysql-summary/pt-mysql-summary.t
View File

@@ -25,7 +25,7 @@ local $ENV{PTDEBUG} = "";
my $dir = tempdir( CLEANUP => 1 );
`$trunk/bin/$tool --sleep 1 --save-samples $dir`;
`$trunk/bin/$tool --sleep 1 --save-samples $dir -- -P12345 -umsandbox -pmsandbox`;
ok(
-e $dir,
@@ -40,7 +40,9 @@ is(
"And leaves all files in there"
);
`$trunk/bin/$tool --sleep 1 --save-samples $dir`;
`rm -rf "$dir/"*`;
`$trunk/bin/$tool --sleep 1 --save-samples $dir -- -P12345 -umsandbox -pmsandbox`;
open my $fh, "<", "$dir/mysql-variables" or die "Can't open file: $!";
my $data = do { local $/; <$fh> };
@@ -57,7 +59,7 @@ undef($dir);
# --databases
#
my $out = `$trunk/bin/$tool --sleep 1 --databases mysql 2>/dev/null`;
my $out = `$trunk/bin/$tool --sleep 1 --databases mysql -- -P12345 -umsandbox -pmsandbox 2>/dev/null`;
like(
$out,

4
t/pt-mysql-summary/samples/expected_output_temp002.txt
View File

@@ -2,9 +2,6 @@
Port Data Directory Nice OOM Socket
===== ========================== ==== === ======
3306 /var/lib/mysql ? ? /var/run/mysqld/mysqld.sock
# MySQL Executable ###########################################
Path to executable |
Has symbols | Yes
# Report On Port 3306 ########################################
User | hugmeir@localhost
Time | 2012-03-23 21:05:32 (ART)
@@ -177,6 +174,7 @@ Uptime 90000 1 1
Geospatial Types | No
Foreign Keys | No
Partitioning | No
InnoDB Compression | No
SSL | No
Explicit LOCK TABLES | No
Delayed Insert | No

3
t/pt-mysql-summary/samples/expected_output_temp003.txt
View File

@@ -2,9 +2,6 @@
Port Data Directory Nice OOM Socket
===== ========================== ==== === ======
12345 /tmp/12345/data 0 0 /tmp/12345/mysql_sandbox12345.sock
# MySQL Executable ###########################################
Path to executable | /home/vagrant/mysql-5.1.49-barebones/bin/mysql
Has symbols | Yes
# Report On Port 12345 #######################################
User | msandbox@%
Time | 2012-03-27 16:33:46 (BST)

3
t/pt-mysql-summary/samples/expected_output_temp004.txt
View File

@@ -2,9 +2,6 @@
Port Data Directory Nice OOM Socket
===== ========================== ==== === ======
12345 /tmp/12345/data 0 0 /tmp/12345/mysql_sandbox12345.sock
# MySQL Executable ###########################################
Path to executable | /usr/bin/mysql
Has symbols | No
# Report On Port 12345 #######################################
User | msandbox@%
Time | 2012-03-27 09:16:44 (CEST)