uricp 0.0.26 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 937fe351785726ef27786e889bed4d5a1a9f8cb37058916fdb4613c8df528855
-  data.tar.gz: c895d696bcf2613018934f84907f43806fbbd98fce378bbe8663546e986a6608
+  metadata.gz: 9e24fdb3944db682f49ca90b6eb4639885389d689610e76cbcbf5d83e5619208
+  data.tar.gz: 99eeabde06d5f28aa9c33b1faa9306bf9fb65cba504c68359968388515061d8b
 SHA512:
-  metadata.gz: 84b2b32f85a7eb23833501689a14b3776b605e431ff3c5035df641e9f3dbfea17ce9a26f521cb1815a91abe67083f96115f04a928431a7d196093b3387e67c4e
-  data.tar.gz: 9ec10d1d48cd8452c32c2d1f25e196207921f282f323c8383e6ab70cb1b5b3d8beb889421bca912e7c15ef3670135d4ccde0da476ddf96a1d0031c4a9d848c4f
+  metadata.gz: ef6450ea82fe52174ec0037e4e62711c35da6c2c746ecab02d123ec00df35f5bf3697f3b55b595c509274b9446e7a7446f2167401793d17a1f6c00c88cba6186
+  data.tar.gz: 7b9d798e540f9f3e4418e7c7facd08120c1c889320baf8b7d707464aafdd89ad2f492ec7c0233e4537e05027ff6de7eb25fe79444ce753a11600c610cb9a9682

data/Gemfile.lock

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

data/features/rbd_access.feature

@@ -32,7 +32,7 @@ Feature: Manipulate file images in ceph
     """
     And the output should contain:
     """
-    rbd clone --id libvirt 'servers/freedos.qcow2@base' 'servers/srv-testy'
+    rbd clone --id libvirt 'servers/freedos.qcow2@base' 'servers/srv-testy' || { [ $? -eq 22 ] && rbd create --id libvirt -s 0 'servers/srv-testy'; };
     """
 
   Scenario: HTTP URI from file cache via unpopulated rbd cache

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_cached_put.rb

@@ -16,7 +16,9 @@ module Uricp::Strategy
     end
 
     def command
-      "rbd clone --id #{rbd_id} '#{rbd_image_spec(from)}' '#{rbd_image_spec(to)}';"
+      "rbd clone --id #{rbd_id} '#{rbd_image_spec(from)}' "\
+        "'#{rbd_image_spec(to)}' || { [ $? -eq 22 ] && "\
+        "rbd create --id #{rbd_id} -s 0 '#{rbd_image_spec(to)}'; };"
     end
 
     def proposal

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.26'
+  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.26
+  version: 0.0.29
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba