uricp 0.0.27 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bdc788caae911b8877f44865af0a39419c96148ca47ee2536b04d2de1630fc1
-  data.tar.gz: 0f2ae7d75bb93abc8f3eff7437eb82552fa39ef7c9ddfadd7f197f775071519d
+  metadata.gz: a10697c8ebadc4cb158670335272b8b4b4681aac70182c95a6dd2b842587d61a
+  data.tar.gz: a07ca44d72030583442c8e572754aa164498fc8dce625dfde001e107a02b3533
 SHA512:
-  metadata.gz: 77528ea35b99174312d1bdf1aa73ec5d9e53aa1c432dfde4cf9c720c35c093746f5289a3e558c46dff05a39d5efb1a248ec71b6ae6d66192f3e52c420d5ccde1
-  data.tar.gz: 97fc3ada66b80f66374b46d03302f37459d937d31ab5c15ecb3f4ab4f0dd3856031f168ba2f804a199d18e7df31227bc6145d94e263e75c687fa6f73f2306a1c
+  metadata.gz: 35a87e4afe346283df0838e50c8a57b28893e7841582917ef11ee0eee76b20a0f52941616e78cef35c3b7d8d0ab2db5978d5c4cd338054e36bafabee50d12a82
+  data.tar.gz: fd3c6fda3b1624519abd26dd6bc8a54bda4d615ec098d1fb37cf279ab12640c643323b499f25e1fc811d9a2400fea59c55c4a2f1bcbe8c9ba90c629b73fb1775

data/Gemfile.lock

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

data/almalinux8/Dockerfile

@@ -3,11 +3,11 @@ MAINTAINER support@brightbox.co.uk
 
 RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
 RUN dnf -y install dnf-plugins-core
-RUN dnf config-manager --add-repo https://repo.almalinux.org/almalinux/8.4/devel/almalinux-devel.repo
+RUN dnf config-manager --add-repo https://repo.almalinux.org/almalinux/8/devel/almalinux-devel.repo
+RUN echo "8-stream" > /etc/dnf/vars/stream
 RUN dnf -y update
 RUN dnf config-manager --set-enabled powertools,devel
 RUN dnf -y group install "Development Tools"
-RUN dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 RUN dnf -y install https://www.rdoproject.org/repos/rdo-release.el8.rpm
 RUN dnf -y install \
     git \

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
@@ -246,3 +246,55 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/img-testy@base'
     """
+
+  Scenario: RBD export and upload to HTTPS
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I successfully run `uricp  --dry-run --auth-token 'd75945e3b9159f1f14e91b2022bc53ea10481ed15e4a' --target-format 'raw' --compress --segment-size '1073741824B' --cache '/var/cache/domtrix' rbd:/servers/vol-yd63x https://orbit.gb1s.brightbox.com/v1/acc-8tgbq/images/img-cfwe0`
+    And the output should contain:
+    """
+    rbd snap create --id libvirt 'servers/vol-yd63x@uricp_snap'
+    """
+    And the output should contain:
+    """
+    rbd snap protect --id libvirt 'servers/vol-yd63x@uricp_snap'
+    """
+    And the output should not contain:
+    """
+    rbd snap unprotect --id libvirt 'servers/vol-yd63x@uricp_snap'
+    """
+    And the output should not contain:
+    """
+    rbd snap rm --id libvirt 'servers/vol-yd63x@uricp_snap'
+    """
+    And the output should not contain:
+    """
+    rbd export --no-progress --id libvirt 'servers/vol-yd63x@uricp_snap' -
+    """
+    And the output should contain:
+    """
+    rbd clone --id libvirt 'servers/vol-yd63x@uricp_snap' 'servers/img-cfwe0'
+    """
+    And the output should contain:
+    """
+    rbd export --no-progress --id libvirt 'servers/img-cfwe0@base' -
+    """
+    And the output should contain:
+    """
+    rbd snap create --id libvirt 'servers/img-cfwe0@base'
+    """
+    And the output should contain:
+    """
+    rbd snap protect --id libvirt 'servers/img-cfwe0@base'
+    """
+    And the output should contain:
+    """
+    rbd export --no-progress --id libvirt 'servers/img-cfwe0@base' -
+    """
+    And the output should contain:
+    """
+    lz4
+    """
+    And the output should contain:
+    """
+    segment_upload --segment-size '1073741824.00 B'  https://orbit.gb1s.brightbox.com/v1/acc-8tgbq/images/img-cfwe0
+    """

data/lib/uricp/strategy/common.rb

@@ -6,6 +6,8 @@ module Uricp::Strategy
     include Uricp::CurlPrimitives
     include Methadone::SH
 
+    VOL_REGEX = /^(srv|vol)-.....$/
+
     def initialize(options)
       @options = options
       debug "#{self.class.name}: options are #{options.inspect}"
@@ -168,7 +170,7 @@ module Uricp::Strategy
     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-...../
+        if options['dry-cache'] == :partial_rbd && options['cache_name'] !~ VOL_REGEX
           command = 'exit 0'
         else
           command = 'exit 2'
@@ -180,15 +182,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'] !~ VOL_REGEX
+        else
+          snap_check(target, rbd_base_name)
+        end
       result && rbd_clone_snapshot(target)
     end
   end

data/lib/uricp/strategy/piped_rbd_get.rb

@@ -10,8 +10,10 @@ module Uricp::Strategy
       without_active_cache do
         if from.scheme == 'rbd' &&
            rbd_snapshot_spec?(from) &&
-           to.scheme != 'rbd'
-          return proposal unless sequence_complete?
+           to.scheme != 'rbd' &&
+           (!conversion_required? || raw_target?) &&
+           !sequence_complete?
+          return proposal
         end
       end
       debug "#{self.class.name}: not appropriate"
@@ -25,6 +27,7 @@ module Uricp::Strategy
     def proposal
       @proposed_options = options.dup
       @proposed_options['from_uri'] = PIPE_URI
+      @proposed_options.delete('target-format')
       self
     end
   end

data/lib/uricp/strategy/rbd_cached_put.rb

@@ -17,8 +17,8 @@ module Uricp::Strategy
 
     def command
       "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)}';"
+        "'#{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.27'
+  VERSION = '0.0.30'
   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.27
+  version: 0.0.30
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba