zfs_mgmt 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1022834076fa1482f627f9c5b7f8a476dd3e83d3358495d40f6695b23e842a88
-  data.tar.gz: ddc4f5f6e87c00f5cb0c0adbe2b4ddc47f78670c520b701d359b471b19c081c4
+  metadata.gz: a7f44dfd817cadcabaf53c1b8fcfd251b59ffcd919aa8a97a6cc9d19c98bbf45
+  data.tar.gz: 01b9855f993dac35e65e8d41bf67552bd50c85d18d7e6929c6aa8d564dd9533b
 SHA512:
-  metadata.gz: 06eab68af755becb316e438c5e027e78166952c7a37dc1c32343193f140e0a12463784b6a42ada068c0a90571641a11c7971143349d0dff6cc1a2581f34cbe9b
-  data.tar.gz: 9fa676ecf9837096a5e97649f01dfa398610898019f4abd0694fee241e75733767193898e26e618516c23cbf394dcdf1bdb8d9c4639a70a77d49db5b34c2ede4
+  metadata.gz: c9eb6b8de6cc72dec2445ccd4b937c9655fb8ac10105991c9351fe31afd138c5a66575797dcb746a9f0da176cb8c57aeffcc25a8a9ba32fc59f835d2a0b5381e
+  data.tar.gz: c65977164b6aa98cfc3112ef9a9cdb767d7dc675e0bc4acbe2e118becb35b11d8eb6a8b9bf818959cb3754f6b492471481fbde155e966364f21f02a79c983943

data/Gemfile

@@ -7,4 +7,5 @@ gem "thor"
 gem "text-table"
 gem "filesize"
 gem "json"
+gem "timeout"
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zfs_mgmt (0.4.6)
+    zfs_mgmt (0.4.8)
       filesize (~> 0.2)
       text-table (~> 1.2)
       thor (~> 1.0)
@@ -28,6 +28,7 @@ GEM
     rspec-support (3.11.0)
     text-table (1.2.4)
     thor (1.2.1)
+    timeout (0.4.1)
 
 PLATFORMS
   x86_64-linux
@@ -40,6 +41,7 @@ DEPENDENCIES
   rspec (~> 3.0)
   text-table
   thor
+  timeout
   zfs_mgmt!
 
 BUNDLED WITH

data/README.md

@@ -4,8 +4,8 @@ zfs_mgmt aims to provide some useful helpers for managing zfs
 snapshots, and eventually send/recv duties via the zfsmgr script in
 bin/.
 
-Currently only snapshot destruction is implemented by a policy
-specification stored in zfs properties.
+Snapshot creation and deletion by policy along with zfs send wrapping
+are implementation by specifications stored in zfs properties.
 
 ## Installation
 

data/bin/zfsmgr

@@ -16,6 +16,12 @@ class ZfsMgr < Thor
   class_option :loglevel, :type => :string, :default => ( $stdout.isatty ? 'info' : 'warn' ),
                :enum => ['debug','error','fatal','info','warn'],
                :desc => 'set logging level to specified severity'
+  class_option :lock, :type => :boolean, :default => false,
+               :desc => 'lock before running'
+  class_option :lock_file, :type => :string, :default => '/run/zfsmgr.lock',
+               :desc => 'lock file'
+  class_option :lock_wait, :type => :numeric, :default => 0,
+               :desc => 'wait N seconds for lock'
   desc "zfsget [ZFS]", "execute zfs get for the given properties and types and parse the output into a nested hash"
   method_option :properties, :type => :string, :default => ['name'], :desc => "List of properties passed to zfs get", repeatable: true
   method_option :types,      :type => :array, :default => ['filesystem','volume'], enum: ['filesystem','volume','snapshot'], :desc => "list of types"

data/lib/zfs_mgmt/version.rb

@@ -1,3 +1,3 @@
 module ZfsMgmt
-  VERSION = "0.4.6"
+  VERSION = "0.4.8"
 end

data/lib/zfs_mgmt/zfs_mgr/send.rb

@@ -34,7 +34,9 @@ class ZfsMgmt::ZfsMgr::Send < Thor
   def all()
     ZfsMgmt.set_log_level(options[:loglevel])
     ZfsMgmt.global_options = options
+    lock = ZfsMgmt.lock(options)
 
     ZfsMgmt.zfs_send_all(options)
+    ZfsMgmt.unlock(lock)
   end
 end

data/lib/zfs_mgmt/zfs_mgr/snapshot.rb

@@ -11,7 +11,9 @@ class ZfsMgmt::ZfsMgr::Snapshot < Thor
   def destroy()
     ZfsMgmt.set_log_level(options[:loglevel])
     ZfsMgmt.global_options = options
+    lock = ZfsMgmt.lock(options)
     ZfsMgmt.snapshot_destroy(noop: options[:noop], verbose: options[:verbose], filter: options[:filter])
+    ZfsMgmt.unlock(lock)
   end
   desc "policy", "print the policy table for zfs"
   def policy()
@@ -25,6 +27,7 @@ class ZfsMgmt::ZfsMgr::Snapshot < Thor
   def create()
     ZfsMgmt.set_log_level(options[:loglevel])
     ZfsMgmt.global_options = options
+    lock = ZfsMgmt.lock(options)
     ZfsMgmt.snapshot_create(noop: options[:noop], filter: options[:filter])
   end
 end

data/lib/zfs_mgmt.rb

@@ -8,6 +8,7 @@ require 'logger'
 require 'text-table'
 require 'open3'
 require 'filesize'
+require 'timeout'
 
 $logger = Logger.new(STDERR, progname: 'zfs_mgmt')
 
@@ -37,6 +38,8 @@ $properties_xlate = {
   'creation' => ->(x) { x.to_i },
 }
 
+$lock = nil
+
 module ZfsMgmt
   class << self
     attr_accessor :global_options
@@ -603,11 +606,17 @@ module ZfsMgmt
     lcom.push('2>&1')
     lcom = precom + lcom
     $logger.debug(lcom.join(' '))
+    total = 0
     %x[#{lcom.join(' ')}].each_line do |l|
-      if m = /(incremental|size).*\s+(\d+)$/.match(l)
-        return m[2].to_i
+      if m = /^size\s+(\d+)$/.match(l)
+        return m[1].to_i
+      elsif m = /^incremental\s+.+?\s+.+?\s+(\d+)$/.match(l)
+        total = total + m[1].to_i
       end
     end
+    if total > 0
+      return total
+    end
     $logger.error("no estimate available")
     return nil
   end
@@ -682,4 +691,40 @@ module ZfsMgmt
       zfs_send(options,zfs,props,snaps)
     end
   end
+  def self.lock(options)
+    # open lock file, try to lock file until lock_wait has expired or
+    # lock is obtained, write pid?
+    return nil unless options[:lock]
+    begin
+      lock = File.open(options[:lock_file], File::RDWR|File::CREAT, 0644)
+    rescue Errno::ENOENT => error
+      $logger.error("unable to open lock file (#{options[:lock_file]}), possibly the directory doesn't exist")
+      raise
+    end
+    if options[:lock_wait] > 0
+      begin
+        status = Timeout::timeout(options[:lock_wait]) do
+          return lock if lock.flock(File::LOCK_EX)
+          $logger.error("flock of #{options[:lock_file]} failed")
+          raise "flock failed"
+        end
+      rescue Timeout::Error => error
+        $logger.error("timed out waiting to lock")
+        raise
+      end
+    else
+      # zero is wait forever!
+      return lock if lock.flock(File::LOCK_EX)
+      $logger.error("flock of #{options[:lock_file]} failed")
+      raise "flock failed"
+    end
+    $logger.error("unable to obtain lock")
+    raise "unknown failure in locking file"
+  end
+  def self.unlock(lock)
+    unless lock.nil?
+      lock.flock(File::LOCK_UN)
+      lock.close()
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zfs_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors:
 - Aran Cox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Misc. helpers regarding snapshots and send/recv.