diff options
author | Phil Dibowitz <phild@fb.com> | 2015-06-24 05:02:16 -0700 |
---|---|---|
committer | Phil Dibowitz <phild@fb.com> | 2015-06-24 10:13:17 -0700 |
commit | b0baef435c3e3032dde28aafb2caa966fa8f196d (patch) | |
tree | d8b594b6652dcc4cf3c887d5933020e2760a41a2 | |
parent | dc099eef0577bbcd502fc23616cad0f258d0f506 (diff) | |
download | ohai-b0baef435c3e3032dde28aafb2caa966fa8f196d.tar.gz |
Fix darwin filesystem plugin on newer OSX.
Recent versions of Darwin change default 'df' output to have '-i' by default,
which broke parsing by the filesystem plugin. This passes -i in all the time so
we always get consistent output.
There were no tests for this... and even though I'm trying deprecate this plugin
with filesystem2, I still wrote some for ya. :)
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | lib/ohai/plugins/darwin/filesystem.rb | 12 | ||||
-rw-r--r-- | spec/unit/plugins/darwin/filesystem_spec.rb | 95 |
3 files changed, 106 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index da4799be..1c19f966 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ Fix windows 2008 hostname truncation #554 * [**Pavel Yudin**](https://github.com/Kasen): Detect Parallels host and guest virtualisation +* [**Phil Dibowitz**](https://github.com/jymzh): + Fix Darwin filesystem plugin on newer MacOSX ## Release 8.5.0 diff --git a/lib/ohai/plugins/darwin/filesystem.rb b/lib/ohai/plugins/darwin/filesystem.rb index 83c8a6cf..a5c06539 100644 --- a/lib/ohai/plugins/darwin/filesystem.rb +++ b/lib/ohai/plugins/darwin/filesystem.rb @@ -23,21 +23,27 @@ Ohai.plugin(:Filesystem) do fs = Mash.new block_size = 0 - so = shell_out("df") + so = shell_out("df -i") so.stdout.lines do |line| case line when /^Filesystem\s+(\d+)-/ block_size = $1.to_i next - when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/ + when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(\d+)\s+(\d+)\s+(\d+%)\s+(.+)$/ filesystem = $1 fs[filesystem] = Mash.new fs[filesystem][:block_size] = block_size + # To match linux, these should be strings, but we don't want + # to break back compat so we'll leave them as they are. In filesystem2 + # we make them consistent. fs[filesystem][:kb_size] = $2.to_i / (1024 / block_size) fs[filesystem][:kb_used] = $3.to_i / (1024 / block_size) fs[filesystem][:kb_available] = $4.to_i / (1024 / block_size) fs[filesystem][:percent_used] = $5 - fs[filesystem][:mount] = $6 + fs[filesystem][:inodes_used] = $6 + fs[filesystem][:inodes_available] = $7 + fs[filesystem][:total_inodes] = ($6.to_i + $7.to_i).to_s + fs[filesystem][:mount] = $9 end end diff --git a/spec/unit/plugins/darwin/filesystem_spec.rb b/spec/unit/plugins/darwin/filesystem_spec.rb new file mode 100644 index 00000000..a97eaf62 --- /dev/null +++ b/spec/unit/plugins/darwin/filesystem_spec.rb @@ -0,0 +1,95 @@ +# +# Author:: Phil Dibowitz (<phil@ipom.com>) +# Copyright:: Copyright (c) 2015 Facebook, Inc. +# License:: Apache License, Version 2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb') + +describe Ohai::System, "darwin filesystem plugin" do + before(:each) do + @plugin = get_plugin("darwin/filesystem") + allow(@plugin).to receive(:collect_os).and_return(:darwin) + + allow(@plugin).to receive(:shell_out).with("df -i").and_return(mock_shell_out(0, "", "")) + allow(@plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, "", "")) + end + + describe "when gathering filesystem usage data from df" do + before(:each) do + @stdout = <<-DF +Filesystem 512-blocks Used Available Capacity iused ifree %iused Mounted on +/dev/disk0s2 488555536 313696448 174347088 65% 39276054 21793386 64% / +devfs 385 385 0 100% 666 0 100% /dev +map /etc/auto.direct 0 0 0 100% 0 0 100% /mnt/vol +map -hosts 0 0 0 100% 0 0 100% /net +map -static 0 0 0 100% 0 0 100% /mobile_symbol +deweyfs@osxfuse0 0 0 0 100% 0 0 100% /mnt/dewey +DF + allow(@plugin).to receive(:shell_out).with("df -i").and_return(mock_shell_out(0, @stdout, "")) + end + + it "should run df -i" do + expect(@plugin).to receive(:shell_out).ordered.with("df -i").and_return(mock_shell_out(0, @stdout, "")) + @plugin.run + end + + it "should set size to value from df -i" do + @plugin.run + expect(@plugin[:filesystem]["/dev/disk0s2"][:kb_size]).to eq(244277768) + expect(@plugin[:filesystem]["/dev/disk0s2"][:kb_used]).to eq(156848224) + expect(@plugin[:filesystem]["/dev/disk0s2"][:kb_available]).to eq(87173544) + expect(@plugin[:filesystem]["/dev/disk0s2"][:percent_used]).to eq("65%") + end + + it "should set mount to value from df -i" do + @plugin.run + expect(@plugin[:filesystem]["/dev/disk0s2"][:mount]).to eq("/") + end + + it "should set inode info to value from df -i" do + @plugin.run + expect(@plugin[:filesystem]["/dev/disk0s2"][:total_inodes]).to eq("61069440") + expect(@plugin[:filesystem]["/dev/disk0s2"][:inodes_used]).to eq("39276054") + expect(@plugin[:filesystem]["/dev/disk0s2"][:inodes_available]).to eq("21793386") + end + end + + describe "when gathering mounted filesystem data from mount" do + before(:each) do + @stdout = <<-MOUNT +/dev/disk0s2 on / (hfs, local, journaled) +devfs on /dev (devfs, local, nobrowse) +map /etc/auto.direct on /mnt/vol (autofs, automounted, nobrowse) +map -hosts on /net (autofs, nosuid, automounted, nobrowse) +map -static on /mobile_symbol (autofs, automounted, nobrowse) +deweyfs@osxfuse0 on /mnt/dewey (osxfusefs, synchronous, nobrowse) +MOUNT + allow(@plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, @stdout, "")) + end + + it "should run mount" do + expect(@plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, @stdout, "")) + @plugin.run + end + + it "should set values from mount" do + @plugin.run + expect(@plugin[:filesystem]["/dev/disk0s2"][:mount]).to eq("/") + expect(@plugin[:filesystem]["/dev/disk0s2"][:fs_type]).to eq("hfs") + expect(@plugin[:filesystem]["/dev/disk0s2"][:mount_options]).to eq([ "local", "journaled" ]) + end + end +end |