zfs_mgmt 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e363218ad13dc15bae4ca2805c675482954cbd3724581998a2f9513de0f9e2a
-  data.tar.gz: 9f836dfb859155b57b6abfafcb9271a166841162ff46736cfab2e58c054354e9
+  metadata.gz: b0e8d3af1ac03924544fff40f3978ba979b8b4b2adfa968971de7f9c571e503d
+  data.tar.gz: e555e236db39683a9b8fd3c7d12bcb5b9c7800aee285898670acef966f7bd321
 SHA512:
-  metadata.gz: 16218b552ae7d799207d8756dad08f2d013b438a8814f8850f15f8171c2bd9eeeb1b3c52c4a1d2b4d73b82d0f48cb0b217969ddfef91b0d20f331a1d6414cea1
-  data.tar.gz: 23c3b898ec59b05c06b1833faac058fa670d34217e6a43b973aaa20d69891e26c662d67a1658e17e3e67b3d5132f5dc959da5c4b3b158e31fa62990da23be4bc
+  metadata.gz: 9b6f60006226fe6664c3d9ec3364900354d4fbca988615956f6df27f8d76901428845ed122180cb647dd7c391ca6a518516e1734875f6968e57c0c78f2e0ad60
+  data.tar.gz: fa4cd0c9018def638b438fc27ddf855651e61c62d739c5f0c34eb880098bc3558e895826b7de0392d0c10f342d938fc20b524bea67fbcc2ce84b20411b6d4189

data/lib/zfs_mgmt.rb

@@ -250,6 +250,40 @@ 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
+
+      # holdme = deleteme
+      # holds = []
+      # while holdme.length > 0
+      #   for i in 0..(holdme.length - 1) do
+      #     max = holdme.length - 1 - i
+      #     bigarg = holdme[0..max].join(" ") # snaps joined by 
+      #     com = "zfs holds -H #{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)
+      #     so,se,status = Open3.capture3(com)
+      #     if status.signaled?
+      #       $logger.error("process was signalled \"#{com}\", termsig #{status.termsig}")
+      #       raise 'ZfsHoldsError'
+      #     end
+      #     unless status.success?
+      #       $logger.error("failed to execute \"#{com}\", exit status #{status.exitstatus}")
+      #       so.split("\n").each { |l| $logger.debug("stdout: #{l}") }
+      #       se.split("\n").each { |l| $logger.error("stderr: #{l}") }
+      #       raise 'ZfsHoldsError'
+      #     end
+      #     so.split("\n").each do |line|
+      #       holds.append(line.split("\t")[0])
+      #     end
+      #     holdme = holdme - holdme[0..max]
+      #     break
+      #   end
+      # end
+      # $logger.debug("found #{holds.length} snapshots with holds: #{holds.join(',')}")
+      # deleteme = deleteme - holds
       com_base = "zfs destroy -p"
       if deleteme.length > 0
         com_base = "#{com_base}d"
@@ -260,29 +294,25 @@ module ZfsMgmt
       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')}")
-        com = "#{com_base} #{snap_name}"
-        $logger.info(com)
-        system(com)
+      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)
+          if $?.exitstatus != 0
+            $logger.error("zfs exited with non-zero status: #{$?.exitstatus}")
+          end
+          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.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfs_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Aran Cox