ohai 7.2.0 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f5021abfe73ff336fe9486ae97057693bf26393
-  data.tar.gz: 5071190fbdfb48ac7f082ad9414c11ef2e4d3258
+  metadata.gz: 4329545c173368396f653fe483a8c05a0bbfcbf7
+  data.tar.gz: 82c031fc26ba2f9fd0a1c0a91d68eb344c3d44f5
 SHA512:
-  metadata.gz: b8c615bbf2ac0859d6d5880e8c3189abca58270a0e115ce364a443e9f7d34c3b36b9ef679f67d0788501c6d4cb4b0c002cd00dc80fca57229db462f88d264056
-  data.tar.gz: 92dc7cdb0928b81d0695bf2298725fe50887d85c81129c1c765790ca0ca72f6e2069913f2914744f61135e356f1b62eff4372c6f15b21b81b92ce4f7898724b0
+  metadata.gz: eece99b024c9d7e9ee89cd3eaa6213f92bc39586a520e914226e9127f3368edf1c3b11c3d5756c14533742e778f2c0cc80cf951dc1632fe9616615274f140071
+  data.tar.gz: 9c681cd6d5f724a472e8181d4924265edf463a7bc99ccf71f200fc9ca53c4208062e25a40d0f8f890eb6fdce31a423fc0a18e24d14506ceb08f3e5e50293b7c4

data/lib/ohai/plugins/linux/filesystem.rb

@@ -19,8 +19,22 @@
 Ohai.plugin(:Filesystem) do
   provides "filesystem"
 
+  def get_blk_cmd(attr, have_lsblk)
+    if have_lsblk
+      attr = 'FSTYPE' if attr == 'TYPE'
+      "lsblk -r -n -o NAME,#{attr}"
+    else
+      "blkid -s #{attr}"
+    end
+  end
+
+  def get_blk_regex(attr, have_lsblk)
+    have_lsblk ? /^(\S+) (\S+)/ : /^(\S+): #{attr}="(\S+)"/
+  end
+
   collect_data(:linux) do
     fs = Mash.new
+    have_lsblk = File.executable?('/bin/lsblk')
 
     # Grab filesystem data from df
     so = shell_out("df -P")
@@ -68,10 +82,14 @@ Ohai.plugin(:Filesystem) do
       end
     end
 
+    have_lsblk = File.exists?('/bin/lsblk')
+
     # Gather more filesystem types via libuuid, even devices that's aren't mounted
-    so = shell_out("blkid -s TYPE")
+    cmd = get_blk_cmd('TYPE', have_lsblk)
+    regex = get_blk_regex('TYPE', have_lsblk)
+    so = shell_out(cmd)
     so.stdout.lines do |line|
-      if line =~ /^(\S+): TYPE="(\S+)"/
+      if line =~ regex
         filesystem = $1
         fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
         fs[filesystem][:fs_type] = $2
@@ -79,9 +97,11 @@ Ohai.plugin(:Filesystem) do
     end
 
     # Gather device UUIDs via libuuid
-    so = shell_out("blkid -s UUID")
+    cmd = get_blk_cmd('UUID', have_lsblk)
+    regex = get_blk_regex('UUID', have_lsblk)
+    so = shell_out(cmd)
     so.stdout.lines do |line|
-      if line =~ /^(\S+): UUID="(\S+)"/
+      if line =~ regex
         filesystem = $1
         fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
         fs[filesystem][:uuid] = $2
@@ -89,9 +109,11 @@ Ohai.plugin(:Filesystem) do
     end
 
     # Gather device labels via libuuid
-    so = shell_out("blkid -s LABEL")
+    cmd = get_blk_cmd('LABEL', have_lsblk)
+    regex = get_blk_regex('LABEL', have_lsblk)
+    so = shell_out(cmd)
     so.stdout.lines do |line|
-      if line =~ /^(\S+): LABEL="(\S+)"/
+      if line =~ regex
         filesystem = $1
         fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
         fs[filesystem][:label] = $2
@@ -100,7 +122,24 @@ Ohai.plugin(:Filesystem) do
 
     # Grab any missing mount information from /proc/mounts
     if File.exists?('/proc/mounts')
-      File.open('/proc/mounts').read_nonblock(4096).each_line do |line|
+      mounts = ''
+      # Due to https://tickets.opscode.com/browse/OHAI-196
+      # we have to non-block read dev files. Ew.
+      f = File.open('/proc/mounts')
+      loop do
+        begin
+          data = f.read_nonblock(4096)
+          mounts << data
+        # We should just catch EOFError, but the kernel had a period of
+        # bugginess with reading virtual files, so we're being extra
+        # cautious here, catching all exceptions, and then we'll read
+        # whatever data we might have
+        rescue Exception
+          break
+        end
+      end
+      f.close
+      mounts.each_line do |line|
         if line =~ /^(\S+) (\S+) (\S+) (\S+) \S+ \S+$/
           filesystem = $1
           next if fs.has_key?(filesystem)

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '7.2.0'
+  VERSION = '7.2.2'
 end

data/spec/unit/plugins/linux/filesystem_spec.rb

@@ -26,10 +26,18 @@ describe Ohai::System, "Linux filesystem plugin" do
     @plugin.stub(:shell_out).with("df -P").and_return(mock_shell_out(0, "", ""))
     @plugin.stub(:shell_out).with("df -i").and_return(mock_shell_out(0, "", ""))
     @plugin.stub(:shell_out).with("mount").and_return(mock_shell_out(0, "", ""))
+    File.stub(:exists?).with("/bin/lsblk").and_return(false)
     @plugin.stub(:shell_out).with("blkid -s TYPE").and_return(mock_shell_out(0, "", ""))
     @plugin.stub(:shell_out).with("blkid -s UUID").and_return(mock_shell_out(0, "", ""))
     @plugin.stub(:shell_out).with("blkid -s LABEL").and_return(mock_shell_out(0, "", ""))
 
+    @plugin.stub(:shell_out).with("lsblk -r -n -o NAME,FSTYPE").
+      and_return(mock_shell_out(0, "", ""))
+    @plugin.stub(:shell_out).with("lsblk -r -n -o NAME,UUID").
+      and_return(mock_shell_out(0, "", ""))
+    @plugin.stub(:shell_out).with("lsblk -r -n -o NAME,LABEL").
+      and_return(mock_shell_out(0, "", ""))
+
     File.stub(:exists?).with("/proc/mounts").and_return(false)
   end
 
@@ -154,7 +162,7 @@ MOUNT
   describe "when gathering filesystem type data from blkid" do
     before(:each) do
       @stdout = <<-BLKID_TYPE
-dev/sdb1: TYPE=\"linux_raid_member\" 
+/dev/sdb1: TYPE=\"linux_raid_member\" 
 /dev/sdb2: TYPE=\"linux_raid_member\" 
 /dev/sda1: TYPE=\"linux_raid_member\" 
 /dev/sda2: TYPE=\"linux_raid_member\" 
@@ -181,6 +189,39 @@ BLKID_TYPE
     end
   end
 
+  describe "when gathering filesystem type data from lsblk" do
+    before(:each) do
+      File.stub(:exists?).with("/bin/lsblk").and_return(true)
+      @stdout = <<-BLKID_TYPE
+/dev/sdb1 linux_raid_member 
+/dev/sdb2 linux_raid_member 
+/dev/sda1 linux_raid_member 
+/dev/sda2 linux_raid_member 
+/dev/md0 ext3 
+/dev/md1 LVM2_member 
+/dev/mapper/sys.vg-root.lv ext4 
+/dev/mapper/sys.vg-swap.lv swap 
+/dev/mapper/sys.vg-tmp.lv ext4 
+/dev/mapper/sys.vg-usr.lv ext4 
+/dev/mapper/sys.vg-var.lv ext4 
+/dev/mapper/sys.vg-home.lv xfs 
+BLKID_TYPE
+      @plugin.stub(:shell_out).with("lsblk -r -n -o NAME,FSTYPE").
+        and_return(mock_shell_out(0, @stdout, ""))
+    end
+
+    it "should run lsblk -r -n -o NAME,FSTYPE" do
+      @plugin.should_receive(:shell_out).with("lsblk -r -n -o NAME,FSTYPE").
+        and_return(mock_shell_out(0, @stdout, ""))
+      @plugin.run
+    end
+
+    it "should set kb_size to value from lsblk -r -n -o NAME,FSTYPE" do
+      @plugin.run
+      @plugin[:filesystem]["/dev/md1"][:fs_type].should be == "LVM2_member"
+    end
+  end
+
   describe "when gathering filesystem uuid data from blkid" do
     before(:each) do
       @stdout = <<-BLKID_UUID
@@ -211,6 +252,40 @@ BLKID_UUID
     end
   end
 
+  describe "when gathering filesystem uuid data from lsblk" do
+    before(:each) do
+      File.stub(:exists?).with("/bin/lsblk").and_return(true)
+      @stdout = <<-BLKID_UUID
+/dev/sdb1 bd1197e0-6997-1f3a-e27e-7801388308b5 
+/dev/sdb2 e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa 
+/dev/sda1 bd1197e0-6997-1f3a-e27e-7801388308b5 
+/dev/sda2 e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa 
+/dev/md0 37b8de8e-0fe3-4b5a-b9b4-dde33e19bb32 
+/dev/md1 YsIe0R-fj1y-LXTd-imla-opKo-OuIe-TBoxSK 
+/dev/mapper/sys.vg-root.lv 7742d14b-80a3-4e97-9a32-478be9ea9aea 
+/dev/mapper/sys.vg-swap.lv 9bc2e515-8ddc-41c3-9f63-4eaebde9ce96 
+/dev/mapper/sys.vg-tmp.lv 74cf7eb9-428f-479e-9a4a-9943401e81e5 
+/dev/mapper/sys.vg-usr.lv 26ec33c5-d00b-4f88-a550-492def013bbc 
+/dev/mapper/sys.vg-var.lv 6b559c35-7847-4ae2-b512-c99012d3f5b3 
+/dev/mapper/sys.vg-home.lv d6efda02-1b73-453c-8c74-7d8dee78fa5e 
+BLKID_UUID
+      @plugin.stub(:shell_out).with("lsblk -r -n -o NAME,UUID").
+        and_return(mock_shell_out(0, @stdout, ""))
+    end
+
+    it "should run lsblk -r -n -o NAME,UUID" do
+      @plugin.should_receive(:shell_out).with("lsblk -r -n -o NAME,UUID").
+        and_return(mock_shell_out(0, @stdout, ""))
+      @plugin.run
+    end
+
+    it "should set kb_size to value from lsblk -r -n -o NAME,UUID" do
+      @plugin.run
+      @plugin[:filesystem]["/dev/sda2"][:uuid].should be ==
+        "e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa"
+    end
+  end
+
   describe "when gathering filesystem label data from blkid" do
     before(:each) do
       @stdout = <<-BLKID_LABEL
@@ -239,28 +314,67 @@ BLKID_LABEL
     end
   end
 
+  describe "when gathering filesystem label data from lsblk" do
+    before(:each) do
+      File.stub(:exists?).with("/bin/lsblk").and_return(true)
+      @stdout = <<-BLKID_LABEL
+/dev/sda1 fuego:0 
+/dev/sda2 fuego:1 
+/dev/sdb1 fuego:0 
+/dev/sdb2 fuego:1 
+/dev/md0 /boot 
+/dev/mapper/sys.vg-root.lv / 
+/dev/mapper/sys.vg-tmp.lv /tmp 
+/dev/mapper/sys.vg-usr.lv /usr 
+/dev/mapper/sys.vg-var.lv /var 
+/dev/mapper/sys.vg-home.lv /home 
+BLKID_LABEL
+      @plugin.stub(:shell_out).with("lsblk -r -n -o NAME,LABEL").
+        and_return(mock_shell_out(0, @stdout, ""))
+    end
+
+    it "should run blkid -s LABEL" do
+      @plugin.should_receive(:shell_out).with("lsblk -r -n -o NAME,LABEL").
+        and_return(mock_shell_out(0, @stdout, ""))
+      @plugin.run
+    end
+
+    it "should set kb_size to value from blkid -s LABEL" do
+      @plugin.run
+      @plugin[:filesystem]["/dev/md0"][:label].should be == "/boot"
+    end
+  end
+
+
   describe "when gathering data from /proc/mounts" do
     before(:each) do
       File.stub(:exists?).with("/proc/mounts").and_return(true)
       @double_file = double("/proc/mounts")
-      @double_file.stub(:read_nonblock).and_return(@double_file)
-      @double_file.stub(:each_line).
-        and_yield("rootfs / rootfs rw 0 0").
-        and_yield("none /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0").
-        and_yield("none /proc proc rw,nosuid,nodev,noexec,relatime 0 0").
-        and_yield("none /dev devtmpfs rw,relatime,size=2025576k,nr_inodes=506394,mode=755 0 0").
-        and_yield("none /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0").
-        and_yield("/dev/mapper/sys.vg-root.lv / ext4 rw,noatime,errors=remount-ro,barrier=1,data=ordered 0 0").
-        and_yield("tmpfs /lib/init/rw tmpfs rw,nosuid,relatime,mode=755 0 0").
-        and_yield("tmpfs /dev/shm tmpfs rw,nosuid,nodev,relatime 0 0").
-        and_yield("/dev/mapper/sys.vg-home.lv /home xfs rw,noatime,attr2,noquota 0 0").
-        and_yield("/dev/mapper/sys.vg-special.lv /special xfs ro,noatime,attr2,noquota 0 0").
-        and_yield("/dev/mapper/sys.vg-tmp.lv /tmp ext4 rw,noatime,barrier=1,data=ordered 0 0").
-        and_yield("/dev/mapper/sys.vg-usr.lv /usr ext4 rw,noatime,barrier=1,data=ordered 0 0").
-        and_yield("/dev/mapper/sys.vg-var.lv /var ext4 rw,noatime,barrier=1,data=ordered 0 0").
-        and_yield("/dev/md0 /boot ext3 rw,noatime,errors=remount-ro,data=ordered 0 0").
-        and_yield("fusectl /sys/fs/fuse/connections fusectl rw,relatime 0 0").
-        and_yield("binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0")
+      @mounts = <<-MOUNTS
+rootfs / rootfs rw 0 0
+none /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
+none /proc proc rw,nosuid,nodev,noexec,relatime 0 0
+none /dev devtmpfs rw,relatime,size=2025576k,nr_inodes=506394,mode=755 0 0
+none /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0
+/dev/mapper/sys.vg-root.lv / ext4 rw,noatime,errors=remount-ro,barrier=1,data=ordered 0 0
+tmpfs /lib/init/rw tmpfs rw,nosuid,relatime,mode=755 0 0
+tmpfs /dev/shm tmpfs rw,nosuid,nodev,relatime 0 0
+/dev/mapper/sys.vg-home.lv /home xfs rw,noatime,attr2,noquota 0 0
+/dev/mapper/sys.vg-special.lv /special xfs ro,noatime,attr2,noquota 0 0
+/dev/mapper/sys.vg-tmp.lv /tmp ext4 rw,noatime,barrier=1,data=ordered 0 0
+/dev/mapper/sys.vg-usr.lv /usr ext4 rw,noatime,barrier=1,data=ordered 0 0
+/dev/mapper/sys.vg-var.lv /var ext4 rw,noatime,barrier=1,data=ordered 0 0
+/dev/md0 /boot ext3 rw,noatime,errors=remount-ro,data=ordered 0 0
+fusectl /sys/fs/fuse/connections fusectl rw,relatime 0 0
+binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0
+MOUNTS
+      @counter = 0
+      @double_file.stub(:read_nonblock) do
+        @counter += 1
+        raise EOFError if @counter == 2
+        @mounts
+      end
+      @double_file.stub(:close)
       File.stub(:open).with("/proc/mounts").and_return(@double_file)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.2.2
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types