uricp 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeaa81822977930906959744feb0d8bdf9ca820afd10e6b97d32a726cbf67391
-  data.tar.gz: cd29b49f83ba53a275f4574c32cbb7f1b92c5218421cef668355a14ab5a36bec
+  metadata.gz: 1e1b637ff4ba7720c05496e44d43b9dbe71908bb8bf1605e7a64c2ed1497f273
+  data.tar.gz: 037bd61ab71e9f18bd654779d6fe7049d42124f678737c5703e7a76eef9448df
 SHA512:
-  metadata.gz: 56c0e441da6e7e709580e09cdcc68c56b3ff731fc9fd028e56160dbfca427048ecab2f79c049f490bd15bcb027a67ec1b4aa01ddd2ce801cda89ad53f9ba6efa
-  data.tar.gz: 92122076440ca0cbd0345f29bf4386503c9f3830d6a4ffbfc92a4f55e40b9ea7790ff81cc1ebf1101ce7ac4cb552c312bf2be0cc5c3c49f0b727ab0247f46f90
+  metadata.gz: d71cb3c6211690160d6a57130eff9b6ed3043f497ef9b182f1aefd9dbb378d186c16c7093e637f2ed718867d47f6e6a50059976440ece998f8c313facd701be8
+  data.tar.gz: d7feeb5ab8fe6b98e6895d442f38c8404fcc12687dcc851485f6e38e640eb31cfe1bb0dfb2e0803d50261594e918e92034f1653f9ece0d457fea15f98cfbbd3a

data/Gemfile.lock

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

data/bin/uricp

@@ -4,6 +4,7 @@ require 'optparse'
 require 'uri'
 require 'methadone'
 require 'filesize'
+require 'securerandom'
 require 'uricp'
 
 class App

data/features/rbd_access.feature

@@ -79,13 +79,13 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/img-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
     rbd snap unprotect --id libvirt 'servers/img-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
-    rbd snap rm --id libvirt 'servers/img-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/img-testy@uricp_snap'
     """
     And the output should contain:
     """
@@ -103,13 +103,13 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
     rbd snap unprotect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
-    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap'
     """
     And the output should not contain:
     """
@@ -131,10 +131,6 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/img-testy@base'
     """
-    And the output should contain:
-    """
-    rbd flatten --id libvirt --no-progress 'servers/img-testy'
-    """
 
   Scenario: rbd to rbd - populated cache
     Given a correctly initialised cache at "/tmp/uricp"
@@ -165,7 +161,7 @@ Feature: Manipulate file images in ceph
     """
     And the output should contain:
     """
-    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap'
     """
     And the output should contain:
     """
@@ -192,13 +188,13 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
     rbd snap unprotect --id libvirt 'servers/srv-testy@uricp_snap'
     """
-    And the output should contain:
+    And the output should not contain:
     """
-    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap';
+    rbd snap rm --id libvirt 'servers/srv-testy@uricp_snap'
     """
     And the output should not contain:
     """
@@ -220,7 +216,3 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/img-testy@base'
     """
-    And the output should contain:
-    """
-    rbd flatten --id libvirt --no-progress 'servers/img-testy'
-    """

data/lib/uricp/strategy/common.rb

@@ -91,12 +91,14 @@ module Uricp::Strategy
     end
 
     PIPE_URI = URI('pipe:/')
+    DRY_SNAP = 'uricp_snap'.freeze
+
     def rbd_base_name
       'base'.freeze
     end
 
     def rbd_snapshot_name
-      'uricp_snap'.freeze
+      @rbd_snapshot_name ||= dry_run? ? DRY_SNAP : SecureRandom.uuid
     end
 
     def get_temp_filename(base_dir)

data/lib/uricp/strategy/rbd_cache_base_snap.rb

@@ -13,7 +13,7 @@ module Uricp::Strategy
     end
 
     def command
-      "rbd snap create --id #{rbd_id} '#{rbd_clone_snapshot(rbd_cache_name)}' && "\
+      "rbd snap create --id #{rbd_id} '#{rbd_clone_snapshot(rbd_cache_name)}';"\
       "rbd snap protect --id #{rbd_id} '#{rbd_clone_snapshot(rbd_cache_name)}';"
     end
 

data/lib/uricp/strategy/rbd_cache_upload.rb

@@ -19,7 +19,7 @@ module Uricp::Strategy
     end
 
     def command
-      "rbd import --no-progress --id #{rbd_id} #{data_source} '#{rbd_cache_name}' && "
+      "rbd import --no-progress --id #{rbd_id} #{data_source} '#{rbd_cache_name}';"
     end
 
     def proposal

data/lib/uricp/strategy/rbd_cached_put.rb

@@ -23,7 +23,6 @@ module Uricp::Strategy
       if options['rbd_cache_target']
         @proposed_options['to_uri'] = options['rbd_cache_target']
         @proposed_options['rbd_cache_name'] = rbd_image_spec(to)
-        @proposed_options['rbd_flatten'] ||= @proposed_options['rbd_cache_name']
         @proposed_options.delete('rbd_cache_target')
       end
       self

data/lib/uricp/strategy/rbd_snap.rb

@@ -24,17 +24,18 @@ module Uricp::Strategy
     end
 
     def command
-      "rbd snap create --id #{rbd_id} '#{rbd_upload_snapshot(from)}' && " \
-      "rbd snap protect --id #{rbd_id} '#{rbd_upload_snapshot(from)}' && " \
+      "rbd snap create --id #{rbd_id} '#{rbd_upload_snapshot(from)}';" \
+      "rbd snap protect --id #{rbd_id} '#{rbd_upload_snapshot(from)}';" \
     end
 
     def proposal
       @proposed_options = options.dup
-      @proposed_options['rbd_snapshot'] = rbd_upload_snapshot(from)
-      @proposed_options['from_uri'] = rbd_uri(@proposed_options['rbd_snapshot'])
+      @proposed_options['from_uri'] = rbd_uri(rbd_upload_snapshot(from))
       if options['rbd_cache_target']
         @proposed_options['to_uri'] = options['rbd_cache_target']
         @proposed_options['rbd_cache_target'] = to
+      else
+        @proposed_options['rbd_snapshot'] = rbd_upload_snapshot(from) unless to.scheme == 'rbd'
       end
       self
     end

data/lib/uricp/strategy/rbd_sweeper.rb

@@ -10,7 +10,7 @@ module Uricp::Strategy
     end
 
     def command
-      "rbd snap unprotect --id #{rbd_id} '#{options['rbd_snapshot']}' && " \
+      "rbd snap unprotect --id #{rbd_id} '#{options['rbd_snapshot']}';" \
       "rbd snap rm --id #{rbd_id} '#{options['rbd_snapshot']}';"
     end
 

data/lib/uricp/uri_strategy.rb

@@ -49,7 +49,6 @@ module Uricp
       Strategy::PipedLocalGet,
       Strategy::PipedLocalPut,
       Strategy::Cleaner,
-      Strategy::RbdFlattener,
       Strategy::RbdSweeper,
       Strategy::Sweeper
     ].freeze

data/lib/uricp/version.rb

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

data/lib/uricp.rb

@@ -29,7 +29,6 @@ require 'uricp/strategy/rbd_cache_clone'
 require 'uricp/strategy/rbd_cached_get'
 require 'uricp/strategy/rbd_cached_put'
 require 'uricp/strategy/rbd_cache_upload'
-require 'uricp/strategy/rbd_flattener'
 require 'uricp/strategy/rbd_put'
 require 'uricp/strategy/rbd_snap'
 require 'uricp/strategy/rbd_sweeper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -229,7 +229,6 @@ files:
 - lib/uricp/strategy/rbd_cache_upload.rb
 - lib/uricp/strategy/rbd_cached_get.rb
 - lib/uricp/strategy/rbd_cached_put.rb
-- lib/uricp/strategy/rbd_flattener.rb
 - lib/uricp/strategy/rbd_put.rb
 - lib/uricp/strategy/rbd_snap.rb
 - lib/uricp/strategy/rbd_sweeper.rb

data/lib/uricp/strategy/rbd_flattener.rb

@@ -1,23 +0,0 @@
-module Uricp::Strategy
-  class RbdFlattener
-    include Uricp::Strategy::Common
-
-    def appropriate?
-      return proposal if options['rbd_flatten'] &&
-        rbd_sequence_complete?
-
-      debug "#{self.class.name}: not appropriate"
-      false
-    end
-
-    def command
-      "rbd flatten --id #{rbd_id} --no-progress '#{options['rbd_flatten']}' && "
-    end
-
-    def proposal
-      @proposed_options = options.dup
-      @proposed_options.delete('rbd_flatten')
-      self
-    end
-  end
-end