uricp 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f12b0071b707cd164565e756677d620c77aa4433161b28b4e2aed90e764f2e68
-  data.tar.gz: 2a226104ffad1d51b15e6a9ea015d94e058ff7728e66d3f0c708092e1764205b
+  metadata.gz: ff143aca9aad2f48ac2948322959e24a421b95cd04cb545a8921f18e601139f0
+  data.tar.gz: 719d814583ab1513f10bbc04f6c8487c0fb803a6ab8fb4a307de6c1bf6d7c39a
 SHA512:
-  metadata.gz: 420a3273588f2fde0d78b12250be89b0c07fc0f82d9e4101c427780f871f021bba870ff88b14d5adf3dd9ed0c599a944474137040e8ea2f07aaadd326fa6eccc
-  data.tar.gz: 6cba1806fed37f14d5dad8402061f639f9d6e32df79caf66bd06c2bbabcbd68d460b71710ba76f676967301a1b878129b8b92bd7796f697f8159cc9a65da3c89
+  metadata.gz: 78a4cab2edab9ef6ca65a483dc5fe5cad0b221bfd170f891812af0c5883ae11e9b64e60b49be535fc41829d91f21820016c5fcfb94850c83487b0dcb4ba9c36b
+  data.tar.gz: 740916783658e36e3346eda72ea799a7a35e58da3cbb40619516c2f788de343c72a976c95229d85beccd5e9a3b5afcc1ebc85b726ed5cc6e85c2a9723877efaf

data/Gemfile.lock

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

data/lib/uricp/strategy/common.rb

@@ -2,6 +2,7 @@ module Uricp::Strategy
   module Common
     include Methadone::CLILogging
     include Uricp::CurlPrimitives
+    include Methadone::SH
 
     def initialize(options)
       @options = options
@@ -158,6 +159,10 @@ module Uricp::Strategy
       uri.scheme == 'rbd' && uri.path.include?('@')
     end
 
+    def rbd_cache_upload_available?
+      rbd_cache_name && !rbd_cache_image_exists?(rbd_cache_name)
+    end
+
     def rbd_cache_image_exists?(target)
       command = "rbd status --id #{rbd_id} --format json #{target} 2>/dev/null"
       if dry_run?

data/lib/uricp/strategy/piped_cache.rb

@@ -4,7 +4,6 @@ module Uricp::Strategy
   class PipedCache
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
-    include Methadone::SH
 
     def appropriate?
       with_active_cache do
@@ -26,7 +25,7 @@ module Uricp::Strategy
       @proposed_options = options.dup
       @proposed_options['sweep'] = [temp_cache_file, cache_file]
       image_spec_to_check = rbd_cache_image_spec(to)
-      if to.scheme == 'rbd' && !rbd_cache_image_exists?(image_spec_to_check)
+      if to.scheme == 'rbd'
         @proposed_options['rbd_cache_name'] = image_spec_to_check
       end
       @proposed_options.delete('cache')

data/lib/uricp/strategy/piped_rbd_get.rb

@@ -3,7 +3,6 @@ module Uricp::Strategy
   class PipedRbdGet
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
-    include Methadone::SH
 
     def appropriate?
       without_active_cache do

data/lib/uricp/strategy/rbd_cache_base_snap.rb

@@ -1,7 +1,6 @@
 module Uricp::Strategy
   class RbdCacheBaseSnap
     include Uricp::Strategy::Common
-    include Methadone::SH
 
     def appropriate?
       if rbd_cache_name &&

data/lib/uricp/strategy/rbd_cache_check.rb

@@ -4,7 +4,6 @@ module Uricp::Strategy
   class RbdCacheCheck
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
-    include Methadone::SH
 
     def appropriate?
       unless (from.scheme == 'rbd') != (to.scheme == 'rbd')

data/lib/uricp/strategy/rbd_cache_clone.rb

@@ -4,7 +4,6 @@ module Uricp::Strategy
   class RbdCacheClone
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
-    include Methadone::SH
 
     def appropriate?
       unless from.scheme == 'rbd'

data/lib/uricp/strategy/rbd_cache_upload.rb

@@ -1,14 +1,13 @@
 module Uricp::Strategy
   class RbdCacheUpload
     include Uricp::Strategy::Common
-    include Methadone::SH
 
     def appropriate?
       if compression_required? || conversion_required?
         debug "#{self.class.name}: not ready to upload"
         return false
       end
-      if rbd_cache_name
+      if rbd_cache_upload_available?
         case from.scheme
         when 'pipe', 'file'
           return proposal if to.scheme == 'rbd'

data/lib/uricp/strategy/rbd_cached_get.rb

@@ -4,7 +4,6 @@ module Uricp::Strategy
   class RbdCachedGet
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
-    include Methadone::SH
 
     def appropriate?
       if from.scheme != 'rbd' || rbd_snapshot_spec?(from)

data/lib/uricp/strategy/rbd_put.rb

@@ -7,11 +7,13 @@ module Uricp::Strategy
         debug "#{self.class.name}: not ready to upload"
         return false
       end
-      unless rbd_cache_name
-        case from.scheme
-        when 'pipe', 'file'
-          return proposal if to.scheme == 'rbd'
-        end
+      if rbd_cache_upload_available?
+        debug "#{self.class.name}: cacheing in RBD instead"
+        return false
+      end
+      case from.scheme
+      when 'pipe', 'file'
+        return proposal if to.scheme == 'rbd'
       end
       debug "#{self.class.name}: not appropriate"
       false

data/lib/uricp/strategy/rbd_snap.rb

@@ -3,7 +3,6 @@ module Uricp::Strategy
   class RbdSnap
     include Uricp::Strategy::Common
     include Uricp::Strategy::CacheCommon
-    include Methadone::SH
 
     def appropriate?
       without_active_cache do

data/lib/uricp/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Uricp
-  VERSION = '0.0.23'
+  VERSION = '0.0.24'
   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.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler