percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 21:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-03-30 17:23:55 -03:00
parent 33a4096663
commit 562a550a39
5 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-mysql-summary
View File

@@ -708,7 +708,7 @@ setup_data_dir () {
else else
if [ ! -d "$OPT_SAVE_DATA" ]; then if [ ! -d "$OPT_SAVE_DATA" ]; then
mkdir "$OPT_SAVE_DATA" || die "Cannot mkdir $OPT_SAVE_DATA" mkdir "$OPT_SAVE_DATA" || die "Cannot mkdir $OPT_SAVE_DATA"
elif [ "$( ls "$OPT_SAVE_DATA" )" != "0" ]; then elif [ "$( ls "$OPT_SAVE_DATA" | wc -l )" != "0" ]; then
die "--save-samples directory isn't empty, halting." die "--save-samples directory isn't empty, halting."
fi fi
touch "$OPT_SAVE_DATA/test" || die "Cannot write to $OPT_SAVE_DATA" touch "$OPT_SAVE_DATA/test" || die "Cannot write to $OPT_SAVE_DATA"

16
bin/pt-summary
View File

@@ -625,7 +625,7 @@ setup_data_dir () {
else else
if [ ! -d "$OPT_SAVE_DATA" ]; then if [ ! -d "$OPT_SAVE_DATA" ]; then
mkdir "$OPT_SAVE_DATA" || die "Cannot mkdir $OPT_SAVE_DATA" mkdir "$OPT_SAVE_DATA" || die "Cannot mkdir $OPT_SAVE_DATA"
elif [ "$( ls "$OPT_SAVE_DATA" )" != "0" ]; then elif [ "$( ls "$OPT_SAVE_DATA" | wc -l )" != "0" ]; then
die "--save-samples directory isn't empty, halting." die "--save-samples directory isn't empty, halting."
fi fi
touch "$OPT_SAVE_DATA/test" || die "Cannot write to $OPT_SAVE_DATA" touch "$OPT_SAVE_DATA/test" || die "Cannot write to $OPT_SAVE_DATA"
@@ -939,7 +939,7 @@ find_release_and_kernel () { local PTFUNCNAME=find_release_and_kernel;
|| [ "${platform}" = "NetBSD" ] \ || [ "${platform}" = "NetBSD" ] \
|| [ "${platform}" = "OpenBSD" ]; then || [ "${platform}" = "OpenBSD" ]; then
release="$(uname -r)" release="$(uname -r)"
kernel="$($CMD_SYSCTL -n kern.osrevision)" kernel="$($CMD_SYSCTL -n "kern.osrevision")"
elif [ "${platform}" = "SunOS" ]; then elif [ "${platform}" = "SunOS" ]; then
release="$(head -n1 /etc/release)" release="$(head -n1 /etc/release)"
if [ -z "${release}" ]; then if [ -z "${release}" ]; then
@@ -1048,17 +1048,17 @@ find_virtualization_dmesg () { local PTFUNCNAME=find_virtualization_dmesg;
dmidecode_system_info () { local PTFUNCNAME=dmidecode_system_info; dmidecode_system_info () { local PTFUNCNAME=dmidecode_system_info;
if [ "${CMD_DMIDECODE}" ]; then if [ "${CMD_DMIDECODE}" ]; then
local vendor="$($CMD_DMIDECODE -s system-manufacturer 2>/dev/null | sed 's/ *$//g')" local vendor="$($CMD_DMIDECODE -s "system-manufacturer" 2>/dev/null | sed 's/ *$//g')"
echo "vendor ${vendor}" echo "vendor ${vendor}"
if [ "${vendor}" ]; then if [ "${vendor}" ]; then
local product="$($CMD_DMIDECODE -s system-product-name 2>/dev/null | sed 's/ *$//g')" local product="$($CMD_DMIDECODE -s "system-product-name" 2>/dev/null | sed 's/ *$//g')"
local version="$($CMD_DMIDECODE -s system-version 2>/dev/null | sed 's/ *$//g')" local version="$($CMD_DMIDECODE -s "system-version" 2>/dev/null | sed 's/ *$//g')"
local chassis="$($CMD_DMIDECODE -s chassis-type 2>/dev/null | sed 's/ *$//g')" local chassis="$($CMD_DMIDECODE -s "chassis-type" 2>/dev/null | sed 's/ *$//g')"
local servicetag="$($CMD_DMIDECODE -s system-serial-number 2>/dev/null | sed 's/ *$//g')" local servicetag="$($CMD_DMIDECODE -s "system-serial-number" 2>/dev/null | sed 's/ *$//g')"
local system="${vendor}; ${product}; v${version} (${chassis})" local system="${vendor}; ${product}; v${version} (${chassis})"
echo "system ${system}" echo "system ${system}"
echo "servicetag ${servicetag:-Not found}" echo "servicetag ${servicetag:-"Not found"}"
fi fi
fi fi
} }

2
lib/bash/summary_common.sh
View File

@@ -133,7 +133,7 @@ setup_data_dir () {
# Check the user's --save-data dir. # Check the user's --save-data dir.
if [ ! -d "$OPT_SAVE_DATA" ]; then if [ ! -d "$OPT_SAVE_DATA" ]; then
mkdir "$OPT_SAVE_DATA" || die "Cannot mkdir $OPT_SAVE_DATA" mkdir "$OPT_SAVE_DATA" || die "Cannot mkdir $OPT_SAVE_DATA"
elif [ "$( ls "$OPT_SAVE_DATA" )" != "0" ]; then elif [ "$( ls "$OPT_SAVE_DATA" | wc -l )" != "0" ]; then
die "--save-samples directory isn't empty, halting." die "--save-samples directory isn't empty, halting."
fi fi
touch "$OPT_SAVE_DATA/test" || die "Cannot write to $OPT_SAVE_DATA" touch "$OPT_SAVE_DATA/test" || die "Cannot write to $OPT_SAVE_DATA"

2
t/lib/bash/report_system_info.sh
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
plan 46 plan 49
. "$LIB_DIR/alt_cmds.sh" . "$LIB_DIR/alt_cmds.sh"
. "$LIB_DIR/log_warn_die.sh" . "$LIB_DIR/log_warn_die.sh"

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

@@ -14,8 +14,8 @@ use PerconaTest;
my ($tool) = $PROGRAM_NAME =~ m/([\w-]+)\.t$/; my ($tool) = $PROGRAM_NAME =~ m/([\w-]+)\.t$/;
use Test::More tests => 7; use Test::More tests => 6;
use File::Temp qw( tempfile tempdir ); use File::Temp qw( tempdir );
local $ENV{PTDEBUG} = ""; local $ENV{PTDEBUG} = "";
@@ -23,7 +23,7 @@ local $ENV{PTDEBUG} = "";
# --save-samples # --save-samples
# #
my $dir = tempdir( CLEANUP => 1 ); my $dir = tempdir( "percona-testXXXXXXXX", CLEANUP => 1 );
`$trunk/bin/$tool --sleep 1 --save-samples $dir`; `$trunk/bin/$tool --sleep 1 --save-samples $dir`;
@@ -40,17 +40,6 @@ is(
"And leaves all files in there" "And leaves all files in there"
); );
`$trunk/bin/$tool --sleep 1 --save-samples $dir`;
open my $fh, "<", "$dir/mysql-variables" or die "Can't open file: $!";
my $data = do { local $/; <$fh> };
unlike(
$data,
qr/pt-summary-internal-symbols.*pt-summary-internal-symbols/s,
"--save-samples doesn't re-use files if they already exist"
);
close $fh;
undef($dir); undef($dir);
# #
@@ -77,8 +66,6 @@ for my $i (2..4) {
), ),
"--read-samples works for t/pt-mysql-summary/temp00$i", "--read-samples works for t/pt-mysql-summary/temp00$i",
); );
close $fh;
} }
exit; exit;