Merge pull request #84 from AriaXLi/maint_relatime

Update zfs with relatime support

Author: mhashizume

REFERENCE.md

@@ -127,6 +127,10 @@ The refquota property. Valid values are `<size>`, `none`.
 
 The refreservation property. Valid values are `<size>`, `none`.
 
+##### `relatime`
+
+The relatime property. Valid values are `on`, `off`. Only supported on Linux
+
 ##### `reservation`
 
 The reservation property. Valid values are `<size>`, `none`.

lib/puppet/provider/zfs/zfs.rb

@@ -58,7 +58,8 @@ def container_property
   # acltype is for ZFS on Linux, and allows disabling or enabling POSIX ACLs
   # http://webcache.googleusercontent.com/search?q=cache:-p74K0DVsdwJ:developers.slashdot.org/story/11/11/09/2343258/solaris-11-released+&cd=13
   # defaultuserquota is not supported in zfs filesystem versions older than 6 and will error on Solaris 10 machines
-  [:aclmode, :acltype, :shareiscsi, :overlay, :defaultuserquota].each do |field|
+  # relatime is only supported on ZFS on Linux
+  [:aclmode, :acltype, :shareiscsi, :overlay, :defaultuserquota, :relatime].each do |field|
     # The zfs commands use the property value '-' to indicate that the
     # property is not set. We make use of this value to indicate that the
     # property is not set since it is not available. Conversely, if these

lib/puppet/type/zfs.rb

@@ -118,6 +118,14 @@ module Puppet
       desc 'The refreservation property. Valid values are `<size>`, `none`.'
     end
 
+    newproperty(:relatime) do
+      desc 'The relatime property. Valid values are `on`, `off`. Only supported on Linux'
+
+      validate do |_value|
+        raise Puppet::Error _('This property is only supported on Linux') unless Facter.value(:kernel) == 'Linux'
+      end
+    end
+
     newproperty(:reservation) do
       desc 'The reservation property. Valid values are `<size>`, `none`.'
     end

spec/unit/provider/zfs/zfs_spec.rb

@@ -93,7 +93,7 @@
     [:aclinherit, :aclmode, :atime, :canmount, :checksum,
      :compression, :copies, :dedup, :defaultuserquota, :devices, :exec, :logbias,
      :mountpoint, :nbmand, :overlay, :primarycache, :quota, :readonly,
-     :recordsize, :refquota, :refreservation, :reservation,
+     :recordsize, :refquota, :refreservation, :relatime, :reservation,
      :secondarycache, :setuid, :shareiscsi, :sharenfs, :sharesmb,
      :snapdir, :version, :volsize, :vscan, :xattr].each do |prop|
       it "gets #{prop}" do

spec/unit/type/zfs_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Puppet::Type.type(:zfs) do
-  properties = [:ensure, :mountpoint, :compression, :copies, :overlay, :quota, :defaultuserquota, :reservation, :sharenfs, :snapdir, :sync]
+  properties = [:ensure, :mountpoint, :compression, :copies, :overlay, :quota, :defaultuserquota, :relatime, :reservation, :sharenfs, :snapdir, :sync]
 
   properties.each do |property|
     it "has a #{property} property" do