Merge pull request #188 from abottchen/modules-4067-handle-blkid-retcode

(MODULES-4067) Gracefully handle blkid return code 2

Author: pmcmaw

lib/puppet/provider/logical_volume/lvm.rb

@@ -200,15 +200,22 @@ def size=(new_size)
             lvextend( '-L', new_size, path) || fail( "Cannot extend to size #{new_size} because lvextend failed." )
 
             unless @resource[:resize_fs] == :false or @resource[:resize_fs] == false or @resource[:resize_fs] == 'false'
-              blkid_type = blkid(path)
-              if command(:resize4fs) and blkid_type =~ /\bTYPE=\"(ext4)\"/
-                resize4fs( path) || fail( "Cannot resize file system to size #{new_size} because resize2fs failed." )
-              elsif blkid_type =~ /\bTYPE=\"(ext[34])\"/
-                resize2fs( path) || fail( "Cannot resize file system to size #{new_size} because resize2fs failed." )
-              elsif blkid_type =~ /\bTYPE=\"(xfs)\"/
-                xfs_growfs( path) || fail( "Cannot resize filesystem to size #{new_size} because xfs_growfs failed." )
-              elsif blkid_type =~ /\bTYPE=\"(swap)\"/
-                swapoff( path) && mkswap( path) && swapon( path) || fail( "Cannot resize swap to size #{new_size} because mkswap failed." )
+              begin
+                blkid_type = blkid(path)
+                if command(:resize4fs) and blkid_type =~ /\bTYPE=\"(ext4)\"/
+                  resize4fs( path) || fail( "Cannot resize file system to size #{new_size} because resize2fs failed." )
+                elsif blkid_type =~ /\bTYPE=\"(ext[34])\"/
+                  resize2fs( path) || fail( "Cannot resize file system to size #{new_size} because resize2fs failed." )
+                elsif blkid_type =~ /\bTYPE=\"(xfs)\"/
+                  xfs_growfs( path) || fail( "Cannot resize filesystem to size #{new_size} because xfs_growfs failed." )
+                elsif blkid_type =~ /\bTYPE=\"(swap)\"/
+                  swapoff( path) && mkswap( path) && swapon( path) || fail( "Cannot resize swap to size #{new_size} because mkswap failed." )
+                end
+              rescue Puppet::ExecutionFailure => detail
+                ## If blkid returned 2, there is no filesystem present or the file doesn't exist.  This should not be a failure.
+                if detail.message =~ / returned 2:/
+                  Puppet.debug(detail.message)
+                end
               end
             end
 

spec/unit/puppet/provider/logical_volume/lvm_spec.rb

@@ -178,6 +178,16 @@
             @provider.expects(:blkid).with('/dev/myvg/mylv').never
             @provider.size = '2000000k'
           end
+          it "should not report an error from 'blkid' if resizing a filesystem with no filesystem present" do
+            @resource.expects(:[]).with(:name).returns('mylv').at_least_once
+            @resource.expects(:[]).with(:volume_group).returns('myvg').at_least_once
+            @resource.expects(:[]).with(:size).returns('1g').at_least_once
+            @provider.expects(:lvcreate).with('-n', 'mylv', '--size', '1g', 'myvg')
+            @provider.create
+            @provider.expects(:lvs).with('--noheading', '--unit', 'g', '/dev/myvg/mylv').returns(' 1.00g').at_least_once
+            @provider.expects(:lvs).with('--noheading', '-o', 'vg_extent_size', '--units', 'k', '/dev/myvg/mylv').returns(' 1000.00k')
+            expect { @provider.size = '1100000k' }.not_to raise_error(Puppet::ExecutionFailure, /blkid/)
+          end
         end
       end
       context "not in extent portions" do