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 fix-pt-stalk-nfs-bug-1071979.

Browse Source
This commit is contained in:
Daniel Nichter
2013-12-10 20:50:17 -08:00
parent 0f9507559c 620627f43b
commit c726b8e624
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/pt-stalk
View File

@@ -672,10 +672,9 @@ check_disk_space() {
local min_free_pct="${3:-0}"
local bytes_margin="${4:-0}"
local used_bytes=$(perl -ane 'm!^/! && print $F[2] * 1024' "$file")
local free_bytes=$(perl -ane 'm!^/! && print $F[3] * 1024' "$file")
local pct_used=$(perl -ane 'm!^/! && print ($F[4] =~ m/(\d+)/)' "$file")
local used_bytes=$(tail -n 1 "$file" | perl -ane 'print $F[2] * 1024')
local free_bytes=$(tail -n 1 "$file" | perl -ane 'print $F[3] * 1024')
local pct_used=$(tail -n 1 "$file" | perl -ane 'print ($F[4] =~ m/(\d+)/)')
local pct_free=$((100 - $pct_used))
local real_free_bytes=$free_bytes

7
lib/bash/safeguards.sh
View File

@@ -50,10 +50,9 @@ check_disk_space() {
local bytes_margin="${4:-0}"
# Real/actual bytes used and bytes free.
local used_bytes=$(perl -ane 'm!^/! && print $F[2] * 1024' "$file")
local free_bytes=$(perl -ane 'm!^/! && print $F[3] * 1024' "$file")
local pct_used=$(perl -ane 'm!^/! && print ($F[4] =~ m/(\d+)/)' "$file")
local used_bytes=$(tail -n 1 "$file" | perl -ane 'print $F[2] * 1024')
local free_bytes=$(tail -n 1 "$file" | perl -ane 'print $F[3] * 1024')
local pct_used=$(tail -n 1 "$file" | perl -ane 'print ($F[4] =~ m/(\d+)/)')
local pct_free=$((100 - $pct_used))
# Report the real values to the user.

8
t/lib/bash/safeguards.sh
View File

@@ -65,6 +65,14 @@ cmd_ok \
"grep -q 'Actual:[ ]*19% free,' $PT_TMPDIR/out" \
"Calculates % free with margin"
# #############################################################################
# NFS
# https://bugs.launchpad.net/percona-toolkit/+bug/1071979
# #############################################################################
check_disk_space "$SAMPLE/diskspace002.txt" 104857600 5 20971520
is "$?" "0" "df with NFS (bug 1071979)"
# ###########################################################################
# Done
# ###########################################################################

2
t/lib/samples/bash/diskspace002.txt Normal file
View File

@@ -0,0 +1,2 @@
Filesystem 1024-blocks Used Available Capacity Mounted on
10.10.10.1:/vol/data_logs_01 498073600 235646464 262427136 48% /var/log