uricp 0.0.16 → 0.0.21

data/lib/uricp/strategy/piped_rbd_get.rb

@@ -2,43 +2,29 @@ require 'json'
 module Uricp::Strategy
   class PipedRbdGet
     include Uricp::Strategy::Common
+    include Uricp::Strategy::CacheCommon
     include Methadone::SH
 
     def appropriate?
-      case from.scheme
-      when 'rbd'
-        return proposal unless sequence_complete? || snap_in_progress?
+      without_active_cache do
+        if from.scheme == 'rbd' &&
+          rbd_snapshot_spec?(from) &&
+          to.scheme != 'rbd'
+          return proposal unless sequence_complete?
+        end
       end
       debug "#{self.class.name}: not appropriate"
       false
     end
 
     def command
-      "rbd snap create --id #{rbd_id} '#{rbd_snap_target(from)}' && " \
-      "rbd export --no-progress --id #{rbd_id} '#{rbd_snap_target(from)}' - |"
+      "rbd export --no-progress --id #{rbd_id} '#{rbd_image_spec(from)}' - |"
     end
 
     def proposal
       @proposed_options = options.dup
-      @proposed_options['rbd_snapshot'] = rbd_snap_target(from)
       @proposed_options['from_uri'] = PIPE_URI
-      @proposed_options.delete('cache')
-      @proposed_options.delete('cache_name')
       self
     end
-
-    RBD_SNAPSHOT = 'uricp_snap'.freeze
-
-    def rbd_snap_target(uri)
-      "#{rbd_target(uri)}@#{RBD_SNAPSHOT}"
-    end
-
-    def snap_in_progress?
-      return false if dry_run?
-
-      sh "rbd snap ls --id #{rbd_id} --format json #{rbd_target(from)}" do |stdout|
-        JSON.parse(stdout).any? { |x| x['name'] == RBD_SNAPSHOT }
-      end
-    end
   end
 end

data/lib/uricp/strategy/rbd_cache_base_snap.rb

@@ -0,0 +1,27 @@
+module Uricp::Strategy
+  class RbdCacheBaseSnap
+    include Uricp::Strategy::Common
+    include Methadone::SH
+
+    def appropriate?
+      if rbd_cache_name &&
+        rbd_image_spec(from) == rbd_cache_name
+        return proposal
+      end
+      debug "#{self.class.name}: not appropriate"
+      false
+    end
+
+    def command
+      "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
+
+    def proposal
+      @proposed_options = options.dup
+      @proposed_options['from_uri'] = rbd_uri(rbd_clone_snapshot(rbd_cache_name))
+      @proposed_options.delete('rbd_cache_name')
+      self
+    end
+  end
+end

data/lib/uricp/strategy/rbd_cache_check.rb

@@ -0,0 +1,42 @@
+require 'uri'
+
+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')
+        debug "#{self.class.name}: not appropriate"
+        return false
+      end
+
+      with_active_cache do
+        if from.scheme == 'rbd'
+          cache_check = in_rbd_cache(rbd_cache_image_spec(from))
+          return proposal(cache_check) if cache_check
+          debug "#{self.class.name}: no rbd cache entry for #{options['from_uri']}"
+        elsif to.scheme == 'rbd'
+          cache_check = in_rbd_cache(rbd_cache_image_spec(to))
+          return proposal(cache_check) if cache_check
+          debug "#{self.class.name}: no rbd cache entry for #{options['to_uri']}"
+        end
+        false
+      end
+    end
+
+    def command
+      ':;'
+    end
+
+    def proposal(cache_check)
+      @proposed_options = options.dup
+      @proposed_options['from_uri'] = rbd_uri(cache_check)
+      @proposed_options.delete('cache')
+      @proposed_options.delete('cache_name')
+      @proposed_options.delete('dry-cache')
+      self
+    end
+  end
+end

data/lib/uricp/strategy/rbd_cache_clone.rb

@@ -0,0 +1,40 @@
+require 'uri'
+
+module Uricp::Strategy
+  class RbdCacheClone
+    include Uricp::Strategy::Common
+    include Uricp::Strategy::CacheCommon
+    include Methadone::SH
+
+    def appropriate?
+      unless from.scheme == 'rbd'
+        debug "#{self.class.name}: not appropriate"
+        return false
+      end
+
+      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 
+          debug "#{self.class.name}: Unexpected existing cache entry for #{options['to_uri']}"
+          unsupported_transfer
+        end
+        proposal(cache_target)
+      end
+    end
+
+    def command
+      ':;'
+    end
+
+    def proposal(cache_check)
+      @proposed_options = options.dup
+      @proposed_options['rbd_cache_target'] = rbd_uri(cache_check)
+      @proposed_options.delete('cache')
+      @proposed_options.delete('cache_name')
+      @proposed_options.delete('dry-cache')
+      self
+    end
+  end
+end

data/lib/uricp/strategy/rbd_cache_upload.rb

@@ -0,0 +1,40 @@
+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
+        case from.scheme
+        when 'pipe', 'file'
+          return proposal if to.scheme == 'rbd'
+        end
+      end
+      debug "#{self.class.name}: not appropriate"
+      false
+    end
+
+    def command
+      "rbd import --no-progress --id #{rbd_id} #{data_source} '#{rbd_cache_name}' && "
+    end
+
+    def proposal
+      @proposed_options = options.dup
+      @proposed_options['from_uri'] = rbd_uri(rbd_cache_name)
+      self
+    end
+
+    def data_source
+      if from.scheme == 'pipe'
+        '-'
+      else
+        "'#{from.path}'"
+      end
+    end
+
+  end
+end

data/lib/uricp/strategy/rbd_cached_get.rb

@@ -0,0 +1,36 @@
+require 'uri'
+
+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)
+        debug "#{self.class.name}: not appropriate"
+        return false
+      end
+
+      with_active_cache do
+        cache_check = in_rbd_cache(rbd_image_spec(from))
+        return proposal(cache_check) if cache_check
+        debug "#{self.class.name}: no rbd cache entry for #{options['from_uri']}"
+        false
+      end
+    end
+
+    def command
+      ':;'
+    end
+
+    def proposal(cache_check)
+      @proposed_options = options.dup
+      @proposed_options['from_uri'] = rbd_uri(cache_check)
+      @proposed_options.delete('cache')
+      @proposed_options.delete('cache_name')
+      @proposed_options.delete('dry-cache')
+      self
+    end
+  end
+end

data/lib/uricp/strategy/rbd_cached_put.rb

@@ -0,0 +1,33 @@
+module Uricp::Strategy
+  class RbdCachedPut
+    include Uricp::Strategy::Common
+    include Uricp::Strategy::CacheCommon
+
+    def appropriate?
+      return proposal if to.scheme == 'rbd' &&
+        rbd_snapshot_spec?(from) && 
+        rbd_cache_name.nil? &&
+        !rbd_sequence_complete?
+
+      debug "#{self.class.name}: not appropriate"
+      false
+    end
+
+    def command
+      "rbd clone --id #{rbd_id} '#{rbd_image_spec(from)}' '#{rbd_image_spec(to)}';"
+    end
+
+    def proposal
+      @proposed_options = options.dup
+      @proposed_options['from_uri'] = to
+      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
+    end
+
+  end
+end

data/lib/uricp/strategy/rbd_flattener.rb

@@ -0,0 +1,23 @@
+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

data/lib/uricp/strategy/{rbd_remote_put.rb → rbd_put.rb}

@@ -1,5 +1,5 @@
 module Uricp::Strategy
-  class RbdRemotePut
+  class RbdPut
     include Uricp::Strategy::Common
 
     def appropriate?
@@ -7,16 +7,18 @@ module Uricp::Strategy
         debug "#{self.class.name}: not ready to upload"
         return false
       end
-      case from.scheme
-      when 'pipe', 'file'
-        return proposal if to.scheme == 'rbd'
+      unless rbd_cache_name
+        case from.scheme
+        when 'pipe', 'file'
+          return proposal if to.scheme == 'rbd'
+        end
       end
       debug "#{self.class.name}: not appropriate"
       false
     end
 
     def command
-      "rbd import --no-progress --id #{rbd_id} #{data_source} '#{rbd_target(to)}';"
+      "rbd import --no-progress --id #{rbd_id} #{data_source} '#{rbd_image_spec(to)}';"
     end
 
     def proposal

data/lib/uricp/strategy/rbd_snap.rb

@@ -0,0 +1,56 @@
+require 'json'
+module Uricp::Strategy
+  class RbdSnap
+    include Uricp::Strategy::Common
+    include Uricp::Strategy::CacheCommon
+    include Methadone::SH
+
+    def appropriate?
+      without_active_cache do
+        if from.scheme == 'rbd' &&
+          options['rbd_snapshot'].nil? &&
+          !rbd_snapshot_spec?(from) &&
+          (rbd_cache_name.nil? ||
+            !from.path.include?(rbd_cache_name))
+          if snap_in_progress?
+            debug "#{self.class.name}: detected snapshot in progress"
+          else
+            return proposal unless sequence_complete?
+          end
+        end
+      end
+      debug "#{self.class.name}: not appropriate"
+      false
+    end
+
+    def command
+      "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'])
+      if options['rbd_cache_target']
+        @proposed_options['to_uri'] = options['rbd_cache_target']
+        @proposed_options['rbd_cache_target'] = to
+      end
+      self
+    end
+
+    def rbd_upload_snapshot(uri)
+      "#{rbd_image_spec(uri)}@#{rbd_snapshot_name}"
+    end
+
+    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
+    end
+  end
+end

data/lib/uricp/strategy/rbd_sweeper.rb

@@ -3,13 +3,14 @@ module Uricp::Strategy
     include Uricp::Strategy::Common
 
     def appropriate?
-      return proposal if options['rbd_snapshot'] && sequence_complete?
+      return proposal if options['rbd_snapshot'] && rbd_sequence_complete?
 
       debug "#{self.class.name}: not appropriate"
       false
     end
 
     def command
+      "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

@@ -25,6 +25,10 @@ module Uricp
 
     # This is an ordered list from the most specific to the most general
     STRATEGIES = [
+      Strategy::RbdCachedGet,
+      Strategy::RbdCacheClone,
+      Strategy::RbdCacheCheck,
+      Strategy::RbdSnap,
       Strategy::CachedGet,
       Strategy::PipedRemoteGet,
       Strategy::PipedRbdGet,
@@ -35,13 +39,17 @@ module Uricp
       Strategy::LocalConvert,
       Strategy::LocalLink,
       Strategy::PipedCompress,
-      Strategy::RbdRemotePut,
+      Strategy::RbdCacheUpload,
+      Strategy::RbdCachedPut,
+      Strategy::RbdPut,
+      Strategy::RbdCacheBaseSnap,
       Strategy::SegmentedRemotePut,
       Strategy::RemotePut,
       Strategy::PipedLocalCompress,
       Strategy::PipedLocalGet,
       Strategy::PipedLocalPut,
       Strategy::Cleaner,
+      Strategy::RbdFlattener,
       Strategy::RbdSweeper,
       Strategy::Sweeper
     ].freeze

data/lib/uricp/version.rb

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