snap-ebs 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c62d36f1e86965f89d7733040c0ed8d6a70054be
-  data.tar.gz: 30e45d4efff41f0813b14a1a113b33daab257f41
+  metadata.gz: 62c41bd18a3cbb71c5371a5173dea68f58d36424
+  data.tar.gz: f6746f30e90bb026ecb23bcdfdbc84fce247b25d
 SHA512:
-  metadata.gz: d434a18fa189acf1ba449b49a6cce5e9058614c5cb35e0eb62c44a26ca9f43a34b0290122fa2b139134f2e8a8fd52d1883e2453b5fb258b54e6af6348f25efad
-  data.tar.gz: 089ba5066f153d6b1d8c542372c626d1dd17e8e9f251a719a7f6053bca980be34c0744fd23279f7ca0c4b0f0e8b9e06029d9d8054690d3d617256d4761de1f21
+  metadata.gz: 4dab5f0340738c8bc137fd46b03b84fafee0281f40ffd6078fbc48e2ffe236916caf6a5fa06c45376b4ddb98dcf0cbf37b8a9eb79916d47343c70dab57e0af1a
+  data.tar.gz: af3ae2147a22fcac3759934a2f4b10e0d56dd6dde19bb5b9e6c0a9f64f0bd2e9ab6be4014f175e4b55a0a86a7cb03eabd89c1e7c782784801dc1f5ec2d95e9db

data/lib/plugins/mongo_plugin.rb

@@ -37,7 +37,7 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
   def before
     require 'mongo'
     Mongo::Logger.logger = logger
-    return unless safe_to_operate?
+    return false unless safe_to_operate?
 
     if wired_tiger?
       logger.info "Wired Tiger storage engine detected"
@@ -46,6 +46,8 @@ class SnapEbs::Plugin::MongoPlugin < SnapEbs::Plugin
       logger.info "MMAPv1 storage engine detected"
       carefully('lock mongo') { lock_mongo }
     end
+
+    true
   end
 
   def after

data/lib/snap_ebs/options.rb

@@ -43,6 +43,14 @@ class SnapEbs
             options.directory = d
           end
 
+          o.on("-r", "--retry-count COUNT", "Retry AWS API calls COUNT times before failing (default: #{options.retry_count})") do |count|
+            options.retry_count = count
+          end
+
+          o.on("-i", "--retry-interval SECONDS", "Wait the given number of seconds between API retries (default: #{options.retry_interval})") do |seconds|
+            options.retry_interval = seconds.to_i
+          end
+
           o.on("", "--version", "Show version and exit") do |d|
             puts "snap-ebs v#{::SnapEbs::VERSION}"
             exit 0
@@ -58,6 +66,15 @@ class SnapEbs
 
   # Get the root `options` object, and instance of OpenStruct
   def options
-    @options ||= OpenStruct.new
+    @options ||= OpenStruct.new(default_options)
+  end
+
+  private
+
+  def default_options
+    {
+      retry_count: 100,
+      retry_interval: 10
+    }
   end
 end

data/lib/snap_ebs/snapshotter.rb

@@ -8,43 +8,40 @@ module SnapEbs::Snapshotter
   # Takes snapshots of attached volumes (optionally filtering by volumes
   # mounted to the given directories)
   def take_snapshots
-    begin
-      system 'sync'
-      attached_volumes.each do |vol|
-        dir = device_to_directory device_name vol
-        fs_freeze dir if options[:fs_freeze]
-        next unless should_snap vol
-        logger.debug "Snapping #{vol.id}"
-        begin
-          snapshot = compute.snapshots.new
-          snapshot.volume_id = vol.id
-          snapshot.description = snapshot_name(vol)
-          snapshot.save
-          snapshot
-        rescue StandardError => e
-          logger.warn "Received error while snapping #{vol.id}:"
-          logger.warn e
-        end
-        fs_unfreeze dir if options[:fs_freeze]
+    snapped_volumes = []
+    logger.debug "Issuing sync command"
+    system 'sync'
+
+    logger.debug "Walking attached volumes"
+    attached_volumes.each do |vol|
+      dir = device_to_directory device_name vol
+      logger.debug "Found #{vol.id} mounted on #{dir}"
+      unless should_snap vol
+        logger.debug "Skipping #{vol.id}"
+        next
       end
-    rescue StandardError => e
-      logger.warn "Received error while walking volumes:"
-      logger.warn e
+
+      fs_freeze dir if options[:fs_freeze]
+      take_snapshot vol
+      snapped_volumes.push vol
+      fs_unfreeze dir if options[:fs_freeze]
     end
+    snapped_volumes
   end
 
   # Get the Fog compute object. When `--mock` is given, `Fog.mock!` is called
-  # and  information normally auto-detected from AWS is injected with dummy
+  # and information normally auto-detected from AWS is injected with dummy
   # values to circumvent the lazy loaders.
   def compute
     require 'fog/aws'
+    logger.debug "Mock: #{options[:mock]}"
     if options[:mock]
       Fog.mock!
       @region = 'us-east-1'
-      @instance_id = 'i-deadbeef'
       @instance_name = 'totally-not-the-cia'
     end
 
+    logger.debug "AWS region auto-detected as #{region}"
     @compute ||= Fog::Compute.new({
       :aws_access_key_id => access_key,
       :aws_secret_access_key => secret_key,
@@ -55,8 +52,22 @@ module SnapEbs::Snapshotter
 
   private
 
+  def take_snapshot vol
+    logger.debug "Snapping #{vol.id}"
+    snapshot = compute.snapshots.new
+    snapshot.volume_id = vol.id
+    snapshot.description = snapshot_name(vol)
+
+    if retry_on_transient_error { snapshot.save }
+      logger.debug "Done saving snapshot for #{vol.id}"
+    else
+      logger.warn "Problems saving snapshot, see above"
+    end
+  end
+
   def attached_volumes
-    @attached_volumes ||= compute.volumes.select { |vol| vol.server_id == instance_id }
+    logger.debug "Querying for volumes attached to this instance #{instance_id}"
+    @attached_volumes ||= (retry_on_transient_error { compute.volumes.select { |vol| vol.server_id == instance_id } } || [])
   end
 
   def access_key
@@ -72,7 +83,11 @@ module SnapEbs::Snapshotter
   end
 
   def instance_id
-    @instance_id ||= JSON.parse(HTTParty.get(AWS_INSTANCE_ID_URL))["instanceId"]
+    if options[:mock]
+      @instance_id = 'i-deadbeef'
+    else
+      @instance_id ||= JSON.parse(HTTParty.get(AWS_INSTANCE_ID_URL))["instanceId"]
+    end
   end
 
   def instance_name
@@ -120,12 +135,33 @@ module SnapEbs::Snapshotter
   end
 
   def fs_freeze dir
+    logger.debug "Preparing to freeze #{dir}"
     return logger.warn "Refusing to freeze #{dir}, which is the root device (#{directory_to_device dir})" if is_root_device? dir
     system("#{fs_freeze_command} -f #{dir}")
   end
 
   def fs_unfreeze dir
+    logger.debug "Preparing to unfreeze #{dir}"
     return logger.warn "Refusing to unfreeze #{dir}, which is the root device (#{directory_to_device dir})" if is_root_device? dir
     system("#{fs_freeze_command} -u #{dir}")
   end
+
+  # Retries the given block options.retry_count times while it raises transient AWS
+  # API errors. Returns nil if the number of attempts has been exceeded
+  def retry_on_transient_error
+    (options.retry_count.to_i + 1).times do |n|
+      logger.debug "Attempt ##{n}"
+      begin
+        result = yield
+      rescue Fog::Compute::AWS::Error => e
+        sleep_seconds = options.retry_interval * (n+1)
+        logger.warn "Received AWS error: #{e}"
+        logger.warn "Sleeping #{sleep_seconds} seconds before retrying"
+        sleep sleep_seconds
+      else
+        return result
+      end
+    end
+    nil
+  end
 end

data/lib/snap_ebs/version.rb

@@ -1,3 +1,3 @@
 class SnapEbs
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

data/lib/snap_ebs.rb

@@ -41,16 +41,19 @@ class SnapEbs
   # standard exceptions (i.e. out of memory or keyboard interrupt) will still
   # cause a execution to abort.
   def run
+    ok = true
     plugins.each do |plugin|
+      next unless plugin.options.enable
       begin
-        plugin.before if plugin.options.enable
+        # we don't snap unless all plugin.before calls return a truthy value
+        ok = ok && plugin.before
       rescue => e
         logger.error "Encountered error while running the #{plugin.name} plugin's before hook"
         logger.error e
       end
     end
 
-    take_snapshots
+    take_snapshots if ok
 
     plugins.each do |plugin|
       begin
@@ -66,7 +69,12 @@ class SnapEbs
   def execute
     option_parser.parse!
     logger.debug "Debug logging enabled"
-    run
+    begin
+      run
+    rescue Exception => e
+      logger.fatal "Encountered exception #{e}"
+      e.backtrace.map { |x| logger.fatal x }
+    end
   end
 
   # Get the global logger instance

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snap-ebs
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Bryan Conrad