aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-03-15 11:26:02 +0100
committerFredrik Gustafsson <[email protected]>2013-03-15 11:26:02 +0100
commit9e6214fb792adbe566bc0155c7050a07a531a825 (patch)
treeecb0a9539cd2d35050b843e8e30914dc68f6064e
parentc4011d1760f0a24f225a7ae55b1326689e00d227 (diff)
parentbdb135a4d9c6aa32204d5c87f6e59c3b1b4c86be (diff)
downloadotp-9e6214fb792adbe566bc0155c7050a07a531a825.tar.gz
otp-9e6214fb792adbe566bc0155c7050a07a531a825.tar.bz2
otp-9e6214fb792adbe566bc0155c7050a07a531a825.zip
Merge branch 'sm/fix-disksup-susv3/OTP-10945' into maint
* sm/fix-disksup-susv3/OTP-10945: This patch fixes disksup:get_disk_data for SUSv3, specifically OS X ML
-rw-r--r--lib/os_mon/src/disksup.erl24
1 files changed, 22 insertions, 2 deletions
diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl
index f5f76f1488..f906f33d32 100644
--- a/lib/os_mon/src/disksup.erl
+++ b/lib/os_mon/src/disksup.erl
@@ -275,8 +275,8 @@ check_disk_space({unix, sunos4}, Port, Threshold) ->
Result = my_cmd("df", Port),
check_disks_solaris(skip_to_eol(Result), Threshold);
check_disk_space({unix, darwin}, Port, Threshold) ->
- Result = my_cmd("/bin/df -k -t ufs,hfs", Port),
- check_disks_solaris(skip_to_eol(Result), Threshold).
+ Result = my_cmd("/bin/df -i -k -t ufs,hfs", Port),
+ check_disks_susv3(skip_to_eol(Result), Threshold).
% This code works for Linux and FreeBSD as well
check_disks_solaris("", _Threshold) ->
@@ -298,6 +298,26 @@ check_disks_solaris(Str, Threshold) ->
check_disks_solaris(skip_to_eol(Str),Threshold)
end.
+% Parse per SUSv3 specification, notably recent OS X
+check_disks_susv3("", _Threshold) ->
+ [];
+check_disks_susv3("\n", _Threshold) ->
+ [];
+check_disks_susv3(Str, Threshold) ->
+ case io_lib:fread("~s~d~d~d~d%~d~d~d%~s", Str) of
+ {ok, [_FS, KB, _Used, _Avail, Cap, _IUsed, _IFree, _ICap, MntOn], RestStr} ->
+ if
+ Cap >= Threshold ->
+ set_alarm({disk_almost_full, MntOn}, []);
+ true ->
+ clear_alarm({disk_almost_full, MntOn})
+ end,
+ [{MntOn, KB, Cap} |
+ check_disks_susv3(RestStr, Threshold)];
+ _Other ->
+ check_disks_susv3(skip_to_eol(Str),Threshold)
+ end.
+
%% Irix: like Linux with an extra FS type column and no '%'.
check_disks_irix("", _Threshold) -> [];
check_disks_irix("\n", _Threshold) -> [];