uricp 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f38de4de6dab603e4d1afb48ef53953b96ab81ab3c00e43d00175fd70b833ff2
-  data.tar.gz: f801e290216b13aad5c8dc18e03415a8892b9833130298ed0bc06d86d3b81edc
+  metadata.gz: 9e24fdb3944db682f49ca90b6eb4639885389d689610e76cbcbf5d83e5619208
+  data.tar.gz: 99eeabde06d5f28aa9c33b1faa9306bf9fb65cba504c68359968388515061d8b
 SHA512:
-  metadata.gz: 12a6308de8648ef1695db50ef507fcb86302f53534631dba9949386217f3f07e8f2ed1bd3738b0bcf77b40d6b9f5603d5aa1becd319b8025ba16e8eb6f4821d0
-  data.tar.gz: 03f1d0286bf5d74f0c34987f00d35f19634fd3172599241954c443c70621976b59deaa566b615f37351a14d6a3eb55273f4df84fe76698e7c01c69d027ad7c96
+  metadata.gz: ef6450ea82fe52174ec0037e4e62711c35da6c2c746ecab02d123ec00df35f5bf3697f3b55b595c509274b9446e7a7446f2167401793d17a1f6c00c88cba6186
+  data.tar.gz: 7b9d798e540f9f3e4418e7c7facd08120c1c889320baf8b7d707464aafdd89ad2f492ec7c0233e4537e05027ff6de7eb25fe79444ce753a11600c610cb9a9682

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.28)
+    uricp (0.0.29)
       childprocess (~> 1.0)
       filesize (= 0.0.2)
       methadone (~> 2.0.2)

data/lib/uricp/strategy/common.rb

@@ -180,15 +180,23 @@ module Uricp::Strategy
       false
     end
 
-    def in_rbd_cache(target)
+    def snap_check(target, name)
       result = false
-      if dry_run?
-        result = options['dry-cache'] == :rbd && options['cache_name'] !~ /srv-...../
-      else
-        sh "rbd snap ls --id #{rbd_id} --format json #{target} 2>/dev/null" do |stdout|
-          result = JSON.parse(stdout).any? { |x| x['name'] == rbd_base_name }
-        end
+      sh "rbd snap ls --id #{rbd_id} --format json #{target} 2>/dev/null" do |stdout|
+        result = JSON.parse(stdout).any? { |x| x['name'] == name }
       end
+      result
+    rescue Methadone::FailedCommandError
+      false
+    end
+
+    def in_rbd_cache(target)
+      result =
+        if dry_run?
+          options['dry-cache'] == :rbd && options['cache_name'] !~ /srv-...../
+        else
+          snap_check(target, rbd_base_name)
+        end
       result && rbd_clone_snapshot(target)
     end
   end

data/lib/uricp/strategy/rbd_snap.rb

@@ -47,12 +47,7 @@ module Uricp::Strategy
 
     def snap_in_progress?
       return false if dry_run?
-
-      result = false
-      sh "rbd snap ls --id #{rbd_id} --format json #{rbd_image_spec(from)} 2>/dev/null" do |stdout|
-        result = JSON.parse(stdout).any? { |x| x['name'] == rbd_snapshot_name }
-      end
-      result
+      snap_check(rbd_image_spec(from), rbd_snapshot_name)
     end
   end
 end

data/lib/uricp/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Uricp
-  VERSION = '0.0.28'
+  VERSION = '0.0.29'
   DEFAULT_SEGMENT_SIZE = '5 GiB'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba