zfs_mgmt 0.2.6 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5c67b730a6425cce0f548ebb67c1e17a8448ea12cdf276e54d4f182bb30a17e
-  data.tar.gz: 4cbe541a5c8f12c57b0fbc5b3879d782debf596fb8afe85f0e702bda55d349e6
+  metadata.gz: 2d748c3781993440f81add0c6f609501457dfee0f66c39bd1ca6013534312608
+  data.tar.gz: 71349e6012f6ece929a66d0df3626c9adabff11cd520f10120639d7fb72a5380
 SHA512:
-  metadata.gz: 66328802d68ac95c5ef12f9ed8a51705367adba6857a1f20fda7fc2237013d0abe76d7a2ef7d44e7056ddf72c30ce5922f4f5dd9df1757ce7eb80a9b34eb5a9e
-  data.tar.gz: c6aa92723d903ea2d5192193350c8c41db116c307347308834895061e6eb7d2380e4501d663a2563c46d8869ebd60b832e49699f3dc38c57991818d07791a4a8
+  metadata.gz: e6de5cb8f68d59a336a4a295afa297a836007a457e944cd8bb80ade1aba8b9869144b7eddd71eeb9b536d85685050bd77c92cb5721ce2b49beffe9faf8ff6914
+  data.tar.gz: '02569c3d29effdc5be76672513ef6c2e338416b59dd7496025bd75a3f8fe751f57bfb27db56b136dd35879889cf9708000f760adaed61d9587f869b83c7e10cb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zfs_mgmt (0.2.5)
+    zfs_mgmt (0.3.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -165,6 +165,18 @@ to match the specified policy for the zfs, nor will they be deleted.
 The intended use is match zfs send/recv snapshots or hand-created
 snapshots, etc.  ie: ^syncoid_
 
+### zfsmgmt:prefersnaps
+Prefer snapshots matching this regexp pattern.  The oldest/youngest
+snapshot matching this pattern will be used depending on strategy, but
+if no snapshots are found matching this pattern use any snapshot as
+constrained by the matchsnaps and ignoresnaps options (if set.)
+
+### zfsmgmt:strategy (default: oldest)
+Save the oldest snapshot fitting a given time frame as specificed by
+the policy, unless this value is set to "youngest" in which case use
+the most recent snapshot for any given time frame.  The default is
+oldest and unless the property is set to youngest oldest will be used.
+
 ### zfsmgmt:snapshot
 If this property is 'true' then create a snapshot in the format of
 zfsmgmt-%FT%T%z.  If this property is 'recursive' then create a

data/lib/zfs_mgmt.rb

@@ -44,6 +44,7 @@ module ZfsMgmt
       'minage',
       'matchsnaps',
       'ignoresnaps',
+      'prefersnaps',
       'snapshot',
       'snap_prefix',
       'snap_timestamp',
@@ -117,13 +118,11 @@ module ZfsMgmt
     if props.has_key?('zfsmgmt:minage')
       minage = timespec_to_seconds(props['zfsmgmt:minage'])
     end
-    strategy = 'youngest'
-    if props.has_key?('zfsmgmt:strategy') and props['zfsmgmt:strategy'] == 'oldest'
-      strategy = 'oldest'
+    strategy = 'oldest'
+    if props.has_key?('zfsmgmt:strategy') and props['zfsmgmt:strategy'] == 'youngest'
+      strategy = 'youngest'
     end
     sorted = snaps.keys.sort { |a,b| snaps[b]['creation'] <=> snaps[a]['creation'] }
-    # never consider the latest snapshot for anything
-    newest_snapshot_name = sorted.shift
     
     counters = policy_parser(props['zfsmgmt:policy'])
     $logger.debug(counters)
@@ -147,12 +146,16 @@ module ZfsMgmt
       $date_patterns.each do |d,p|
         pat = snaptime.strftime(p)
         if saved[d].has_key?(pat)
-          if strategy == 'youngest'
+          #pp props['zfsmgmt:prefersnaps'],snap_name.split('@')[1], saved[d][pat].split('@')[1]
+          if props.has_key?('zfsmgmt:prefersnaps') and /#{props['zfsmgmt:prefersnaps']}/ !~ saved[d][pat].split('@')[1] and /#{props['zfsmgmt:prefersnaps']}/ =~ snap_name.split('@')[1]
+            $logger.debug("updating the saved snapshot, we prefer this one: \"#{pat}\" to #{snap_name} at #{snaptime}")
+            saved[d][pat] = snap_name
+          elsif strategy == 'oldest' and ( not props.has_key?('zfsmgmt:prefersnaps') or /#{props['zfsmgmt:prefersnaps']}/ =~ snap_name.split('@')[1] )
             # update the existing current save snapshot for this timeframe
             $logger.debug("updating the saved snapshot for \"#{pat}\" to #{snap_name} at #{snaptime}")
             saved[d][pat] = snap_name
           else
-            $logger.debug("not updating the saved snapshot for \"#{pat}\" to #{snap_name} at #{snaptime}, we have an older snap")
+            $logger.debug("not updating the saved snapshot for \"#{pat}\" to #{snap_name} at #{snaptime}, we have a younger snap")
           end
         elsif counters[d] > 0
           # new pattern, and we want to save more snaps of this type
@@ -179,6 +182,9 @@ module ZfsMgmt
       elsif minage > 0 and Time.at(snaps[snap]['creation'] + minage) > Time.now()
         $logger.debug("skipping due to minage: #{snap} #{local_epoch_to_datetime(snaps[snap]['creation']).strftime('%F %T')}")
         false
+      elsif snap == sorted[0] # the very newest snap
+        $logger.debug("skipping due to newest: #{snap} #{local_epoch_to_datetime(snaps[snap]['creation']).strftime('%F %T')}")
+        false
       else
         true
       end
@@ -224,10 +230,10 @@ module ZfsMgmt
       end
       # print a table of saved snapshots with the reasons it is being saved
       table = Text::Table.new
-      table.head = ['snap','creation','hourly','daily','weekly','monthly','yearly']
+      table.head = [zfs,'creation','hourly','daily','weekly','monthly','yearly']
       table.rows = []
       saved_snaps.sort { |a,b| snaps[b]['creation'] <=> snaps[a]['creation'] }.each do |snap|
-        table.rows << [snap,local_epoch_to_datetime(snaps[snap]['creation'])] + find_saved_reason(saved,snap)
+        table.rows << [snap.split('@')[1],local_epoch_to_datetime(snaps[snap]['creation'])] + find_saved_reason(saved,snap)
       end
       print table.to_s
     end
@@ -244,17 +250,21 @@ module ZfsMgmt
       (saved,saved_snaps,deleteme) = snapshot_destroy_policy(zfs,props,snaps)
     
       $logger.info("deleting #{deleteme.length} snapshots for #{zfs}")
+      deleteme.reverse! # oldest first for removal
+      deleteme.each do |snap_name|
+        $logger.debug("delete: #{snap_name} #{local_epoch_to_datetime(snaps[snap_name]['creation']).strftime('%F %T')}")
+      end
+
       com_base = "zfs destroy -p"
+      if deleteme.length > 0
+        com_base = "#{com_base}d"
+      end
       if noop
         com_base = "#{com_base}n"
       end
       if verbopt
         com_base = "#{com_base}v"
       end
-      deleteme.reverse! # oldest first for removal
-      deleteme.each do |snap_name|
-        $logger.debug("delete: #{snap_name} #{local_epoch_to_datetime(snaps[snap_name]['creation']).strftime('%F %T')}")
-      end
       while deleteme.length > 0
         for i in 0..(deleteme.length - 1) do
           max = deleteme.length - 1 - i
@@ -268,6 +278,9 @@ module ZfsMgmt
           $logger.info(com)
           deleteme = deleteme - deleteme[0..max]
           system(com)
+          if $?.exitstatus != 0
+            $logger.error("zfs exited with non-zero status: #{$?.exitstatus}")
+          end
           break
         end
       end

data/lib/zfs_mgmt/version.rb

@@ -1,3 +1,3 @@
 module ZfsMgmt
-  VERSION = "0.2.6"
+  VERSION = "0.3.3"
 end

data/zfs_mgmt.gemspec

@@ -39,8 +39,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "thor", "~> 1.0.1"
-  spec.add_development_dependency "text-table", "~> 1.2.4"
-  spec.add_development_dependency "filesize", "~> 0.2.0"
+  spec.add_development_dependency "thor", "~> 1.0"
+  spec.add_development_dependency "text-table", "~> 1.2"
+  spec.add_development_dependency "filesize", "~> 0.2"
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zfs_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.3
 platform: ruby
 authors:
 - Aran Cox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: text-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
 description: 
 email:
 - arancox@gmail.com
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Misc. helpers regarding snapshots and send/recv.