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

Merge changes.

Browse Source
This commit is contained in:
Daniel Nichter
2012-06-04 11:23:40 -04:00
parent 4052c04759 cf6d62a21c
commit c91794e6db
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/bash/collect_system_info.sh
View File

@@ -149,17 +149,19 @@ linux_exclusive_collection () { local PTFUNCNAME=linux_exclusive_collection;
[ "$CMD_GETENFORCE" ] && getenforce="$($CMD_GETENFORCE 2>&1)" [ "$CMD_GETENFORCE" ] && getenforce="$($CMD_GETENFORCE 2>&1)"
echo "getenforce ${getenforce:-"No SELinux detected"}" >> "$data_dir/summary" echo "getenforce ${getenforce:-"No SELinux detected"}" >> "$data_dir/summary"
echo "swappiness $(awk '/vm.swappiness/{print $3}' "$data_dir/sysctl")" >> "$data_dir/summary" if [ -e "$data_dir/sysctl" ]; then
echo "swappiness $(awk '/vm.swappiness/{print $3}' "$data_dir/sysctl")" >> "$data_dir/summary"
local dirty_ratio="$(awk '/vm.dirty_ratio/{print $3}' "$data_dir/sysctl")" local dirty_ratio="$(awk '/vm.dirty_ratio/{print $3}' "$data_dir/sysctl")"
local dirty_bg_ratio="$(awk '/vm.dirty_background_ratio/{print $3}' "$data_dir/sysctl")" local dirty_bg_ratio="$(awk '/vm.dirty_background_ratio/{print $3}' "$data_dir/sysctl")"
if [ "$dirty_ratio" -a "$dirty_bg_ratio" ]; then if [ "$dirty_ratio" -a "$dirty_bg_ratio" ]; then
echo "dirtypolicy $dirty_ratio, $dirty_bg_ratio" >> "$data_dir/summary" echo "dirtypolicy $dirty_ratio, $dirty_bg_ratio" >> "$data_dir/summary"
fi fi
local dirty_bytes="$(awk '/vm.dirty_bytes/{print $3}' "$data_dir/sysctl")" local dirty_bytes="$(awk '/vm.dirty_bytes/{print $3}' "$data_dir/sysctl")"
if [ "$dirty_bytes" ]; then if [ "$dirty_bytes" ]; then
echo "dirtystatus $(awk '/vm.dirty_bytes/{print $3}' "$data_dir/sysctl"), $(awk '/vm.dirty_background_bytes/{print $3}' "$data_dir/sysctl")" >> "$data_dir/summary" echo "dirtystatus $(awk '/vm.dirty_bytes/{print $3}' "$data_dir/sysctl"), $(awk '/vm.dirty_background_bytes/{print $3}' "$data_dir/sysctl")" >> "$data_dir/summary"
fi
fi fi
schedulers_and_queue_size "$data_dir/summary" > "$data_dir/partitioning" schedulers_and_queue_size "$data_dir/summary" > "$data_dir/partitioning"

13
t/lib/bash/collect_system_info.sh
View File

@@ -168,7 +168,9 @@ test_linux_exclusive_collection () {
local PT_SUMMARY_SKIP="" local PT_SUMMARY_SKIP=""
mkdir "$dir/1" mkdir "$dir/1"
cp "$dir/sysctl" "$dir/1/" if [ -e "$dir/sysctl" ]; then
cp "$dir/sysctl" "$dir/1/"
fi
linux_exclusive_collection "$dir/1" linux_exclusive_collection "$dir/1"
is \ is \
@@ -183,7 +185,9 @@ test_linux_exclusive_collection () {
done done
mkdir "$dir/2" mkdir "$dir/2"
cp "$dir/sysctl" "$dir/2/" if [ -e "$dir/sysctl" ]; then
cp "$dir/sysctl" "$dir/2/"
fi
linux_exclusive_collection "$dir/2" linux_exclusive_collection "$dir/2"
is \ is \
@@ -205,8 +209,11 @@ platform="$(get_var platform "$p/summary")"
if [ "$platform" = "Linux" ]; then if [ "$platform" = "Linux" ]; then
mkdir "$TMPDIR/linux_data" mkdir "$TMPDIR/linux_data"
cp "$p/sysctl" "$TMPDIR/linux_data/sysctl" if [ -e "$p/sysctl" ]; then
cp "$p/sysctl" "$TMPDIR/linux_data/sysctl"
fi
test_linux_exclusive_collection "$TMPDIR/linux_data" test_linux_exclusive_collection "$TMPDIR/linux_data"
rm -rf "$TMPDIR/linux_data"
else else
skip 1 5 "Tests exclusive for Linux" skip 1 5 "Tests exclusive for Linux"
fi fi

1
t/pt-upgrade/skip_non_select.t
View File

@@ -52,5 +52,6 @@ ok(
# ############################################################################# # #############################################################################
$sb->wipe_clean($dbh1); $sb->wipe_clean($dbh1);
$sb->wipe_clean($dbh2); $sb->wipe_clean($dbh2);
diag(`$trunk/sandbox/stop-sandbox master 12348 >/dev/null`);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
exit; exit;