zfs_mgmt 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5c67b730a6425cce0f548ebb67c1e17a8448ea12cdf276e54d4f182bb30a17e
-  data.tar.gz: 4cbe541a5c8f12c57b0fbc5b3879d782debf596fb8afe85f0e702bda55d349e6
+  metadata.gz: 2de1f11ed73e026b52fa86c015ddc14ae82cfe1ac26cd97fee0b02407fb39cd4
+  data.tar.gz: 881ad0dff3a3008146b5fc7332f1f1aee7811c8a334eef4c6dde14876b65625d
 SHA512:
-  metadata.gz: 66328802d68ac95c5ef12f9ed8a51705367adba6857a1f20fda7fc2237013d0abe76d7a2ef7d44e7056ddf72c30ce5922f4f5dd9df1757ce7eb80a9b34eb5a9e
-  data.tar.gz: c6aa92723d903ea2d5192193350c8c41db116c307347308834895061e6eb7d2380e4501d663a2563c46d8869ebd60b832e49699f3dc38c57991818d07791a4a8
+  metadata.gz: 215c743791ac41d0c6d94d54dbf87124c8c846a552b5ec41c3840eeba0673619554f5105532712f573a4a81a30df5aafaf2a55d9d1cbfc8ba4360aa5595464b1
+  data.tar.gz: 12c041e55ebbd35318c21afb883f22e686b8c37f571d2a92f5eeb56a1fc44a3ee54ef7c09fa0fb611a1317250223f84c6cb140bc4d8b3e72f1249cecd5fb5ff2

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

data/lib/zfs_mgmt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zfs_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Aran Cox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler