cookbook renamed to fs_resize

Author: zuazo

.kitchen.yml

@@ -15,5 +15,5 @@ platforms:
 suites:
 - name: default
   run_list:
-    - recipe[partition_resize-test::default]
+    - recipe[fs_resize-test::default]
   attributes:

Berksfile

@@ -1,4 +1,4 @@
 site :opscode
 
 metadata
-cookbook 'partition_resize-test', path: './test/kitchen/cookbooks/partition_resize-test'
+cookbook 'fs_resize-test', path: './test/kitchen/cookbooks/fs_resize-test'

CHANGELOG.md

@@ -1,11 +1,11 @@
-partition_resize CHANGELOG
+fs_resize CHANGELOG
 ==========================
 
-This file is used to list changes made in each version of the partition_resize cookbook.
+This file is used to list changes made in each version of the fs_resize cookbook.
 
 0.1.0
 -----
-- [your_name] - Initial release of partition_resize
+- [your_name] - Initial release of fs_resize
 
 - - -
 Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.

CONTRIBUTING.md

@@ -10,4 +10,4 @@ Contributing
 7. Push to the branch (`$ git push origin my-new-feature`).
 8. [Submit a Pull Request using Github](https://help.github.com/articles/creating-a-pull-request).
 
-Please do not hesitate to [open an issue](https://github.com/onddo/partition_resize-cookbook/issues/new) with any questions or problems.
+Please do not hesitate to [open an issue](https://github.com/onddo/fs_resize-cookbook/issues/new) with any questions or problems.

README.md

@@ -1,11 +1,13 @@
 Description
 ===========
-[![Cookbook Version](https://img.shields.io/cookbook/v/partition_resize.svg?style=flat)](https://supermarket.getchef.com/cookbooks/partition_resize)
-[![Dependency Status](http://img.shields.io/gemnasium/onddo/partition_resize-cookbook.svg?style=flat)](https://gemnasium.com/onddo/partition_resize-cookbook)
-[![Code Climate](http://img.shields.io/codeclimate/github/onddo/partition_resize-cookbook.svg?style=flat)](https://codeclimate.com/github/onddo/partition_resize-cookbook)
-[![Build Status](http://img.shields.io/travis/onddo/partition_resize-cookbook.svg?style=flat)](https://travis-ci.org/onddo/partition_resize-cookbook)
+[![Cookbook Version](https://img.shields.io/cookbook/v/fs_resize.svg?style=flat)](https://supermarket.getchef.com/cookbooks/fs_resize)
+[![Dependency Status](http://img.shields.io/gemnasium/onddo/fs_resize-cookbook.svg?style=flat)](https://gemnasium.com/onddo/fs_resize-cookbook)
+[![Code Climate](http://img.shields.io/codeclimate/github/onddo/fs_resize-cookbook.svg?style=flat)](https://codeclimate.com/github/onddo/fs_resize-cookbook)
+[![Build Status](http://img.shields.io/travis/onddo/fs_resize-cookbook.svg?style=flat)](https://travis-ci.org/onddo/fs_resize-cookbook)
 
-This Chef cookbook resizes partitions automatically when the underlying disk increases its size.
+This Chef cookbook Resizes the file system automatically when the underlying partition or disk increases its size.
+
+It is mainly oriented to work with disks in the cloud.
 
 Requirements
 ============
@@ -21,7 +23,7 @@ This cookbook has been tested on the following platforms:
 * RedHat
 * Ubuntu (>= 12.04)
 
-Please, [let us know](https://github.com/onddo/partition_resize-cookbook/issues/new?title=I%20have%20used%20it%20successfully%20on%20...) if you use it successfully on any other platform.
+Please, [let us know](https://github.com/onddo/fs_resize-cookbook/issues/new?title=I%20have%20used%20it%20successfully%20on%20...) if you use it successfully on any other platform.
 
 ## Applications:
 
@@ -31,7 +33,7 @@ The other required applications usually come with the operating system:
 
 * `lsblk`, `findmnt` and `losetup`: included inside **[util-linux](http://en.wikipedia.org/wiki/Util-linux) (≥ 2.19)** package.
 * `pgrep`: included inside [procps-ng](http://sourceforge.net/projects/procps-ng/) package.
-* `e2fsck` and `dumpe2fs` for *ext3* and *ext4*: included inside [e2fsprogs](http://e2fsprogs.sourceforge.net/) package.
+* `e2fsck`, `dumpe2fs` and `resize2fs` for *ext3* and *ext4*: included inside [e2fsprogs](http://e2fsprogs.sourceforge.net/) package.
 * `xfs_info` and `xfs_growfs` for *XFS*: included inside [xfsprogs](http://oss.sgi.com/projects/xfs/) package.
 
 Attributes
@@ -44,18 +46,18 @@ Attributes
     <th>Default</th>
   </tr>
   <tr>
-    <td><code>node['partition_resize']['compiletime']</code></td>
-    <td>Resize the partitions at compile time.</td>
+    <td><code>node['fs_resize']['compiletime']</code></td>
+    <td>Resize the file systems at compile time.</td>
     <td><code>false</code></td>
   </tr>
 </table>
 
 Recipes
 =======
 
-## partition_resize::default
+## fs_resize::default
 
-Resize mounted partitions.
+Resize mounted file systems.
 
 Usage
 =====
@@ -66,14 +68,14 @@ You can simply include it in a recipe:
 
 ```ruby
 # in your recipe
-include_recipe "partition_resize::default"
+include_recipe "fs_resize::default"
 ```
 
-Don't forget to include the `partition_resize` cookbook as a dependency in the metadata:
+Don't forget to include the `fs_resize` cookbook as a dependency in the metadata:
 
 ```ruby
 # metadata.rb
-depends "partition_resize"
+depends "fs_resize"
 ```
 
 ## Including in the Run List
@@ -86,27 +88,27 @@ Another alternative is to include it in your Run List:
   [...]
   "run_list": [
     [...]
-    "recipe[partition_resize]"
+    "recipe[fs_resize]"
   ]
 }
 ```
 
 Testing
 =======
 
-See [TESTING.md](https://github.com/onddo/partition_resize-cookbook/blob/master/TESTING.md).
+See [TESTING.md](https://github.com/onddo/fs_resize-cookbook/blob/master/TESTING.md).
 
 Contributing
 ============
 
-Please do not hesitate to [open an issue](https://github.com/onddo/partition_resize-cookbook/issues/new) with any questions or problems.
+Please do not hesitate to [open an issue](https://github.com/onddo/fs_resize-cookbook/issues/new) with any questions or problems.
 
-See [CONTRIBUTING.md](https://github.com/onddo/partition_resize-cookbook/blob/master/CONTRIBUTING.md).
+See [CONTRIBUTING.md](https://github.com/onddo/fs_resize-cookbook/blob/master/CONTRIBUTING.md).
 
 TODO
 ====
 
-See [TODO.md](https://github.com/onddo/partition_resize-cookbook/blob/master/TODO.md).
+See [TODO.md](https://github.com/onddo/fs_resize-cookbook/blob/master/TODO.md).
 
 License and Author
 ==================

TODO.md

@@ -1,7 +1,6 @@
 TODO
 ====
 
-* Support for disks with multiple partitions.
 * LVM support.
-* Support for resize unmounted partitions.
+* Support for resize unmounted file systems.
 * Add RSpec unit tests for libraries.

attributes/default.rb

@@ -1,3 +1,3 @@
 # encoding: UTF-8
 
-default['partition_resize']['compiletime'] = false
+default['fs_resize']['compiletime'] = false

libraries/disk_device_base.rb

@@ -0,0 +1,50 @@
+# encoding: UTF-8
+
+require 'chef/mixin/shell_out'
+
+require 'forwardable'
+
+module FilesystemResize
+  # Disk device type abstract base class
+  class DiskDeviceBase
+    extend Forwardable
+    extend Chef::Mixin::ShellOut
+
+    attr_reader :device
+    attr_reader :loop_device
+
+    def initialize(dev)
+      from_loop = Filesystems.from_loop(dev)
+      if !from_loop.nil?
+        @device = from_loop
+        @loop_device = dev
+      else
+        @device = dev
+        @loop_device = Filesystems.to_loop(dev)
+      end
+    end
+
+    def self.shell_out(*args)
+      cmd = super(args)
+      Chef::Log.debug("#shell_out: #{args[0]}")
+      unless cmd.status.success?
+        Chef::Log.info("#shell_out #{args[0]} (STDOUT): #{cmd.stdout}")
+        Chef::Log.info("#shell_out #{args[0]} (STDERR): #{cmd.stderr}")
+      end
+      cmd
+    end
+    def_delegator self, :shell_out
+
+    def block_device
+      @loop_device || @device
+    end
+
+    def loop?
+      !@loop_device.nil?
+    end
+
+    def to_s
+      loop? ? "#{device} (#{loop_device})" : device
+    end
+  end
+end

libraries/filesystem.rb

@@ -0,0 +1,114 @@
+# encoding: UTF-8
+
+module FilesystemResize
+  # This class represent the logical file system as seen from the
+  # operating system
+  class Filesystem < DiskDeviceBase
+    def initialize(dev)
+      super
+      @block_count = @block_size = nil
+    end
+
+    def command_running?(cmd)
+      shell_out("pgrep '#{cmd.gsub(/'/, '')}'").status.success?
+    end
+
+    def ext_size
+      cmd = shell_out("dumpe2fs -h '#{device.gsub(/'/, '')}'")
+      return unless cmd.status.success?
+      cmd.stdout.split("\n").each do |line|
+        case line
+        when /^Block\s+count:\s+([0-9]+)$/
+          @block_count = Regexp.last_match[1].to_i
+        when /^Block\s+size:\s+([0-9]+)$/
+          @block_size = Regexp.last_match[1].to_i
+        end
+      end
+    end
+
+    def ext_resize
+      if command_running?('resize2fs')
+        Chef::Log.warn("#{self.class}: resize2fs already running, skipping")
+        return false
+      end
+      shell_out("e2fsck -f -y '#{device.gsub(/'/, '')}'")
+      shell_out("resize2fs '#{device.gsub(/'/, '')}'").status.success?
+    end
+
+    # must be mounted
+    def xfs_size
+      cmd = shell_out("xfs_info '#{mount_point.gsub(/'/, '')}'")
+      return unless cmd.status.success?
+      cmd.stdout.split("\n").each do |line|
+        next unless line =~ /^data\s+=\s+bsize=([0-9]+)\s+blocks=([0-9]+),/
+        @block_size = Regexp.last_match[1].to_i
+        @block_count = Regexp.last_match[2].to_i
+      end
+    end
+
+    def xfs_resize
+      if command_running?('xfs_growfs')
+        Chef::Log.warn("#{self.class}: xfs_growfs already running, skipping")
+        return false
+      elsif mount_point.nil?
+        Chef::Log.warn(
+          "#{self.class}: mount point not found for #{self}, skipping")
+        return false
+      end
+      shell_out("xfs_growfs -d '#{mount_point.gsub(/'/, '')}'")
+        .status.success?
+    end
+
+    def file_type
+      cmd = shell_out(
+        "file --special-files --dereference '#{device.gsub(/'/, '')}'"
+      )
+      return nil unless cmd.status.success?
+      cmd.stdout.split("\n")[0]
+    end
+
+    # Returns the fs logical size in bytes, nil if not found or error
+    def size
+      @size ||= begin
+        case type
+        when /^ext[0-9]+$/ then ext_size
+        when 'xfs' then xfs_size
+        end
+        @block_count * @block_size unless @block_count.nil? || @block_size.nil?
+      end
+    end
+
+    def type
+      @type ||= begin
+        if file_type =~ / ([^ ]+) filesystem /
+          Regexp.last_match[1].downcase
+        else
+          nil
+        end
+      end
+    end
+
+    def mount_point
+      @mount_point ||= begin
+        cmd = shell_out(
+          'findmnt --list --first-only --canonicalize --evaluate '\
+          '--noheadings --output TARGET '\
+          "'#{block_device.gsub(/'/, '')}'"
+        )
+        cmd.status.success? ? cmd.stdout.split("\n")[0] : nil
+      end
+    end
+
+    def resize
+      Chef::Log.debug("#{self} type: #{type}")
+      case type
+      when /^ext[0-9]+$/ then ext_resize
+      when 'xfs' then xfs_resize
+      else
+        Chef::Log.warn("#{self.class}: unknown fs type: #{type}")
+        return false
+      end
+      true # ignore console errors
+    end
+  end
+end

libraries/filesystem_disk.rb

@@ -0,0 +1,40 @@
+# encoding: UTF-8
+
+module FilesystemResize
+  # This class represent the underlying partition from the physical point of
+  # view. If the physical partition is resized will be reflected here.
+  class FilesystemDisk < DiskDeviceBase
+    def self.lsblk_list
+      cmd = shell_out('lsblk --raw --noheadings --output NAME')
+      cmd.status.success? ? cmd.stdout : ''
+    end
+
+    def lsblk_block
+      path = block_device.gsub(/'/, '')
+      cmd = shell_out(
+        "lsblk --bytes --raw --noheadings --output NAME,SIZE '#{path}'"
+      )
+      cmd.status.success? ? cmd.stdout : ''
+    end
+
+    def size
+      @size ||= begin
+        line = lsblk_block.split("\n")[0]
+        dev = ::File.basename(block_device)
+        if line =~ /^#{Regexp.escape(dev)}\s([0-9]+)/
+          Regexp.last_match[1].to_i
+        else
+          nil
+        end
+      end
+    end
+
+    def self.list
+      lsblk_list.split("\n").each_with_object([]) do |name, devs|
+        dev = name =~ /^\// ? name : "/dev/#{name}"
+        devs << dev
+        devs.delete(Regexp.last_match[1]) if dev =~ /^([^0-9]+)[0-9]+$/
+      end
+    end
+  end
+end