zfs_mgmt 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bec0d396ad060e97b39fd9aacc9fa76948eef806038c50a94aa395db21197c6b
-  data.tar.gz: cf6ad1d373e1c3d8bedb907e5a52f91b01e242012a13695a4732597a6b4af264
+  metadata.gz: 2e363218ad13dc15bae4ca2805c675482954cbd3724581998a2f9513de0f9e2a
+  data.tar.gz: 9f836dfb859155b57b6abfafcb9271a166841162ff46736cfab2e58c054354e9
 SHA512:
-  metadata.gz: 40bb5e2819b78d8b1e5538c688fda22fe2be1d5146d94ede23656fbaaab9350ae16d695cd192c27d155e9e63ada3236d3381f3b1f2e62f919f75f9b3815195e4
-  data.tar.gz: a30ac94f055fcc37a6ceab855e7a5c1a0d8d6418b47eaef11183b6fa644d4da72f02fdc5a9a83c389fd434f675d847fb83fb99f48f81756b54044ef53c5a5565
+  metadata.gz: 16218b552ae7d799207d8756dad08f2d013b438a8814f8850f15f8171c2bd9eeeb1b3c52c4a1d2b4d73b82d0f48cb0b217969ddfef91b0d20f331a1d6414cea1
+  data.tar.gz: 23c3b898ec59b05c06b1833faac058fa670d34217e6a43b973aaa20d69891e26c662d67a1658e17e3e67b3d5132f5dc959da5c4b3b158e31fa62990da23be4bc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zfs_mgmt (0.2.4)
+    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
@@ -173,12 +176,15 @@ module ZfsMgmt
     # delete everything not in the list of saved snapshots
     deleteme = sorted - saved_snaps
     deleteme = deleteme.select { |snap|
-      if props.has_key?('zfsmgmt:ignoresnaps') and /#{props['zfsmgmt:ignoresnaps']}/ =~ snap
+      if props.has_key?('zfsmgmt:ignoresnaps') and /#{props['zfsmgmt:ignoresnaps']}/ =~ snap.split('@')[1]
         $logger.debug("skipping #{snap} because it matches ignoresnaps pattern: #{props['zfsmgmt:ignoresnaps']}")
         false
       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
@@ -245,6 +251,9 @@ module ZfsMgmt
     
       $logger.info("deleting #{deleteme.length} snapshots for #{zfs}")
       com_base = "zfs destroy -p"
+      if deleteme.length > 0
+        com_base = "#{com_base}d"
+      end
       if noop
         com_base = "#{com_base}n"
       end
@@ -254,23 +263,26 @@ module ZfsMgmt
       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')}")
+        com = "#{com_base} #{snap_name}"
+        $logger.info(com)
+        system(com)
       end
-      while deleteme.length > 0
-        for i in 0..(deleteme.length - 1) do
-          max = deleteme.length - 1 - i
-          $logger.debug("attempting to remove snaps 0 through #{max} out of #{deleteme.length} snapshots")
-          bigarg = "#{zfs}@#{deleteme[0..max].map { |s| s.split('@')[1] }.join(',')}"
-          com = "#{com_base} #{bigarg}"
-          $logger.debug("size of bigarg: #{bigarg.length} size of com: #{com.length}")
-          if bigarg.length >= 131072 or com.length >= (2097152-10000)
-            next
-          end
-          $logger.info(com)
-          deleteme = deleteme - deleteme[0..max]
-          system(com)
-          break
-        end
-      end
+      # while deleteme.length > 0
+      #   for i in 0..(deleteme.length - 1) do
+      #     max = deleteme.length - 1 - i
+      #     $logger.debug("attempting to remove snaps 0 through #{max} out of #{deleteme.length} snapshots")
+      #     bigarg = "#{zfs}@#{deleteme[0..max].map { |s| s.split('@')[1] }.join(',')}"
+      #     com = "#{com_base} #{bigarg}"
+      #     $logger.debug("size of bigarg: #{bigarg.length} size of com: #{com.length}")
+      #     if bigarg.length >= 131072 or com.length >= (2097152-10000)
+      #       next
+      #     end
+      #     $logger.info(com)
+      #     deleteme = deleteme - deleteme[0..max]
+      #     system(com)
+      #     break
+      #   end
+      # end
     end
   end
   # parse a policy string into a hash of integers

data/lib/zfs_mgmt/version.rb

@@ -1,3 +1,3 @@
 module ZfsMgmt
-  VERSION = "0.2.4"
+  VERSION = "0.3.1"
 end

data/zfs_mgmt.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
     spec.metadata["homepage_uri"] = spec.homepage
     spec.metadata["source_code_uri"] = spec.homepage
-    spec.metadata["changelog_uri"] = spec.homepage << '/commits/'
+    spec.metadata["changelog_uri"] = "#{spec.homepage}/commits/"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."
@@ -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.4
+  version: 0.3.1
 platform: ruby
 authors:
 - Aran Cox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 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
@@ -127,12 +127,12 @@ files:
 - lib/zfs_mgmt.rb
 - lib/zfs_mgmt/version.rb
 - zfs_mgmt.gemspec
-homepage: https://github.com/aranc23/zfs_mgmt/commits/
+homepage: https://github.com/aranc23/zfs_mgmt
 licenses:
 - GPL-3.0-or-later
 metadata:
-  homepage_uri: https://github.com/aranc23/zfs_mgmt/commits/
-  source_code_uri: https://github.com/aranc23/zfs_mgmt/commits/
+  homepage_uri: https://github.com/aranc23/zfs_mgmt
+  source_code_uri: https://github.com/aranc23/zfs_mgmt
   changelog_uri: https://github.com/aranc23/zfs_mgmt/commits/
 post_install_message: 
 rdoc_options: []
@@ -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.