zfs_mgmt 0.2.7 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de1f11ed73e026b52fa86c015ddc14ae82cfe1ac26cd97fee0b02407fb39cd4
-  data.tar.gz: 881ad0dff3a3008146b5fc7332f1f1aee7811c8a334eef4c6dde14876b65625d
+  metadata.gz: cf232dcb9239cd6f1858e5f26430227bf19c8c33a8b537708fa9cfe1ac7fcde4
+  data.tar.gz: beaf85ba9e0fcadd8dd03962989592b1d33415cbafadfbf0b3c654f243fc7c0e
 SHA512:
-  metadata.gz: 215c743791ac41d0c6d94d54dbf87124c8c846a552b5ec41c3840eeba0673619554f5105532712f573a4a81a30df5aafaf2a55d9d1cbfc8ba4360aa5595464b1
-  data.tar.gz: 12c041e55ebbd35318c21afb883f22e686b8c37f571d2a92f5eeb56a1fc44a3ee54ef7c09fa0fb611a1317250223f84c6cb140bc4d8b3e72f1249cecd5fb5ff2
+  metadata.gz: 831fb028c42c67942afbac8b35ec6b908ab10c0c9acb3183b19facd32e009ea512629c86af2ad3bc7f8dff9a2c31cf90e4e0317a4c1e32f72a297da3fc826b19
+  data.tar.gz: 7a3d8b9c734302d828298b6507d31f1539cc34739f41ff0fc8adddd1c3842a78dbd62b8ba5876ab0893ffb5f8295e187ba1e4232f6aaadfd211fffb0d00f0d0e

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rspec_status

data/Gemfile.lock

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

data/bin/zfsmgr

@@ -35,6 +35,8 @@ class ZfsMgr < Thor
   end
   desc "snapshot SUBCOMMAND ...ARGS", "manage snapshots"
   subcommand "snapshot", Snapshot
+  desc "list SUBCOMMAND ...ARGS", "list filesystems"
+  subcommand "list", ZfsMgrList
 end
 
 ZfsMgr.start(ARGV)

data/lib/zfs_mgmt.rb

@@ -230,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
@@ -250,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
@@ -274,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
@@ -318,3 +325,26 @@ module ZfsMgmt
     end
   end
 end
+class ZfsMgrList < Thor
+  class_option :filter, :type => :string, :default => '.+',
+               :desc => 'only act on zfs matching this regexp'
+  desc "stale", "list all zfs with stale snapshots"
+  method_option :age, :desc => "timeframe outside of which the zfs will be considered stale", :default => '1d'
+  def stale()
+    cutoff = Time.at(Time.now.to_i -  ZfsMgmt.timespec_to_seconds(options[:age]))
+    table = Text::Table.new
+    table.head = ['zfs','snapshot','age']
+    table.rows = []
+    ZfsMgmt.zfs_managed_list(filter: options[:filter]).each do |blob|
+      zfs,props,snaps = blob
+      last = snaps.keys.sort { |a,b| snaps[a]['creation'] <=> snaps[b]['creation'] }.last
+      snap_time = Time.at(snaps[last]['creation'])
+      if snap_time < cutoff
+        table.rows << [zfs,last,snap_time]
+      end
+    end
+    if table.rows.count > 0
+      print table.to_s
+    end
+  end
+end

data/lib/zfs_mgmt/version.rb

@@ -1,3 +1,3 @@
 module ZfsMgmt
-  VERSION = "0.2.7"
+  VERSION = "0.3.4"
 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.7
+  version: 0.3.4
 platform: ruby
 authors:
 - Aran Cox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2021-02-12 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.