uricp 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e1b637ff4ba7720c05496e44d43b9dbe71908bb8bf1605e7a64c2ed1497f273
-  data.tar.gz: 037bd61ab71e9f18bd654779d6fe7049d42124f678737c5703e7a76eef9448df
+  metadata.gz: f12b0071b707cd164565e756677d620c77aa4433161b28b4e2aed90e764f2e68
+  data.tar.gz: 2a226104ffad1d51b15e6a9ea015d94e058ff7728e66d3f0c708092e1764205b
 SHA512:
-  metadata.gz: d71cb3c6211690160d6a57130eff9b6ed3043f497ef9b182f1aefd9dbb378d186c16c7093e637f2ed718867d47f6e6a50059976440ece998f8c313facd701be8
-  data.tar.gz: d7feeb5ab8fe6b98e6895d442f38c8404fcc12687dcc851485f6e38e640eb31cfe1bb0dfb2e0803d50261594e918e92034f1653f9ece0d457fea15f98cfbbd3a
+  metadata.gz: 420a3273588f2fde0d78b12250be89b0c07fc0f82d9e4101c427780f871f021bba870ff88b14d5adf3dd9ed0c599a944474137040e8ea2f07aaadd326fa6eccc
+  data.tar.gz: 6cba1806fed37f14d5dad8402061f639f9d6e32df79caf66bd06c2bbabcbd68d460b71710ba76f676967301a1b878129b8b92bd7796f697f8159cc9a65da3c89

data/Gemfile.lock

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

data/bin/uricp

@@ -122,8 +122,8 @@ class App
     "Compress output")
   on("--[no-]dry-run",
     "Show what would be run,", "but don't run the command")
-  on("--[no-]dry-cache",
-    "On dry runs assume the cache is populated")
+  on("--dry-cache DRY_CACHE",[:rbd, :partial_rbd],
+    "On dry runs assume the cache is populated", "[rbd, partial_rbd]")
   on("--[no-]force",
     "Always write sparsely")
   #Arguments

data/features/rbd_access.feature

@@ -56,9 +56,21 @@ Feature: Manipulate file images in ceph
     rbd clone --id libvirt 'servers/freedos.qcow2@base' 'servers/srv-testy'
     """
 
-  Scenario: HTTP URI to rbd via populated caches
+    Scenario: HTTP URI to rbd via partial rbd caches
     Given a correctly initialised cache at "/tmp/uricp"
-    When I successfully run `uricp --dry-run --dry-cache --target-format=raw --cache=/tmp/uricp http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.qcow2 rbd:///servers/srv-testy`
+    When I successfully run `uricp --dry-run --dry-cache=partial_rbd --target-format=raw --cache=/tmp/uricp http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.qcow2 rbd:///servers/srv-testy`
+    And the output should not contain:
+    """
+    snap create
+    """
+    And the output should contain:
+    """
+    rbd import --no-progress --id libvirt - 'servers/srv-testy'
+    """
+
+  Scenario: HTTP URI to rbd via populated cache
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I successfully run `uricp --dry-run --dry-cache=rbd --target-format=raw --cache=/tmp/uricp http://orbit.brightbox.com/v1/acc-tqs4c/downloads/freedos.qcow2 rbd:///servers/srv-testy`
     And the output should not contain:
     """
     snap create
@@ -132,9 +144,18 @@ Feature: Manipulate file images in ceph
     rbd snap protect --id libvirt 'servers/img-testy@base'
     """
 
+  Scenario: rbd to rbd - partial cache
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I run `uricp --dry-run --dry-cache=partial_rbd --cache=/tmp/uricp rbd:///servers/srv-testy rbd:///servers/img-testy`
+    Then the exit status should be 70
+    And the output should contain:
+    """
+    Unsupported transfer
+    """
+
   Scenario: rbd to rbd - populated cache
     Given a correctly initialised cache at "/tmp/uricp"
-    When I successfully run `uricp --dry-run --dry-cache --cache=/tmp/uricp rbd:///servers/img-testy rbd:///servers/srv-testy`
+    When I successfully run `uricp --dry-run --dry-cache=rbd --cache=/tmp/uricp rbd:///servers/img-testy rbd:///servers/srv-testy`
     And the output should not contain:
     """
     snap create
@@ -170,7 +191,16 @@ Feature: Manipulate file images in ceph
 
   Scenario: RBD export with cacheing - populated cache
     Given a correctly initialised cache at "/tmp/uricp"
-    When I run `uricp --dry-run --dry-cache --compress --cache=/tmp/uricp rbd:///servers/srv-testy file:///tmp/img-testy`
+    When I run `uricp --dry-run --dry-cache=rbd --compress --cache=/tmp/uricp rbd:///servers/srv-testy file:///tmp/img-testy`
+    Then the exit status should be 70
+    And the output should contain:
+    """
+    Unsupported transfer
+    """
+
+  Scenario: RBD export with cacheing - partial cache
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I run `uricp --dry-run --dry-cache=partial_rbd --compress --cache=/tmp/uricp rbd:///servers/srv-testy file:///tmp/img-testy`
     Then the exit status should be 70
     And the output should contain:
     """

data/lib/uricp/strategy/cache_common.rb

@@ -34,7 +34,7 @@ module Uricp::Strategy
     end
 
     def in_cache?
-      File.readable?(cache_file) || options['dry-cache']
+      File.readable?(cache_file) || options['dry-cache'] == :rbd
     end
 
     def cache_root

data/lib/uricp/strategy/common.rb

@@ -158,10 +158,25 @@ module Uricp::Strategy
       uri.scheme == 'rbd' && uri.path.include?('@')
     end
 
+    def rbd_cache_image_exists?(target)
+      command = "rbd status --id #{rbd_id} --format json #{target} 2>/dev/null"
+      if dry_run?
+        if options['dry-cache'] == :partial_rbd && options['cache_name'] !~ /srv-...../
+          command = "exit 0"
+        else
+          command = "exit 2"
+        end
+      end
+      sh!(command)
+      true
+    rescue Methadone::FailedCommandError
+      false
+    end
+
     def in_rbd_cache(target)
       result = false
       if dry_run?
-        result = options['dry-cache'] && options['cache_name'] !~ /srv-...../
+        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 }

data/lib/uricp/strategy/piped_cache.rb

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

data/lib/uricp/strategy/rbd_cache_clone.rb

@@ -15,8 +15,7 @@ module Uricp::Strategy
       with_active_cache do
         options['cache_name'] = File.basename(options['to_uri'].path)
         cache_target = rbd_cache_image_spec(from)
-        cache_check = in_rbd_cache(rbd_cache_image_spec(from))
-        if cache_check 
+        if rbd_cache_image_exists?(cache_target) || in_rbd_cache(cache_target)
           debug "#{self.class.name}: Unexpected existing cache entry for #{options['to_uri']}"
           unsupported_transfer
         end

data/lib/uricp/version.rb

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