ec2-rotate-volume-snapshots 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/bin/ec2-rotate-volume-snapshots

@@ -9,7 +9,8 @@ opts = {
   :aws_secret_access_key => ENV["AWS_SECRET_ACCESS_KEY"],
   :aws_region => 'us-east-1',
   :pattern => nil,
-  :dry_run => false
+  :dry_run => false,
+  :backoff_limit => 0
 }
 
 time_periods = {
@@ -37,6 +38,10 @@ OptionParser.new do |o|
     opts[:pattern] = v
   end
 
+  o.on("--backoff-limit LIMIT", "Backoff and retry when hitting EC2 Request Limit exceptions no more than this many times. Default is 0 (no limit)") do |v|
+    opts[:backoff_limit] = v
+  end
+
   time_periods.keys.sort { |a, b| time_periods[a][:seconds] <=> time_periods[b][:seconds] }.each do |period|
     o.on("--keep-#{period} NUMBER", Integer, "Number of #{period} snapshots to keep") do |v|
       time_periods[period][:keep] = v
@@ -63,6 +68,12 @@ if ARGV.empty?
 end
 volume_ids = ARGV
 
+if opts[:backoff_limit] < 0
+  puts "A negative backoff limit doesn't make much sense."
+  exit 1
+end
+
+backoffed = 0
 ec2 = RightAws::Ec2.new(opts[:aws_access_key], opts[:aws_secret_access_key], :region => opts[:aws_region])
 all_snapshots = ec2.describe_snapshots(:filters => { 'volume-id' => volume_ids })
 
@@ -116,18 +127,30 @@ volume_ids.each do |volume_id|
       puts "  #{time.strftime '%Y-%m-%d %H:%M:%S'} #{snapshot_id} Keeping for #{keep_reason}"
     else
       puts "  #{time.strftime '%Y-%m-%d %H:%M:%S'} #{snapshot_id} Deleting"
-      ec2.delete_snapshot(snapshot_id) unless opts[:dry_run]
-      
-      # Hardcore rigorous testing has shown that sleeping 5 seconds after 50 deletes
-      # keeps the RequestLimitExceeded error away in 2 out of 2 trials, while sleeping 
-      # 1 second was insufficient. 
-      # There doesn't seem to be any published numbers for what the limit actually is,
-      # and there does seem to be plenty of implications that it depends on your account,
-      # the AWS service, and possibly phases of the moon and AWS's internal activities.
-      deletes = deletes + 1
-      if deletes > 50
-        deletes = 0
-        sleep 5
+      begin
+        ec2.delete_snapshot(snapshot_id) unless opts[:dry_run]
+      rescue RightAws::AwsError => e
+        # If we have been sending too many EC2 requests, then let's backoff a random
+        # amount of time and try again later.
+        if e.errors.kind_of? Array
+          if e.errors[0][0] == 'RequestLimitExceeded'
+            backoffed = backoffed + 1
+
+            if opts[:backoff_limit] > 0 && opts[backoff_limit] < backoffed
+              puts "Too many backoff attempts. Sorry it didn't work out."
+              exit 2
+            end
+
+            naptime = rand(60) * backoffed
+            puts "Backing off for #{naptime} seconds..."
+            sleep naptime
+            retry
+          else
+            raise e
+          end
+        else
+          raise e
+        end
       end
     end
   end

data/ec2-rotate-volume-snapshots.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ec2-rotate-volume-snapshots}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zach Wily"]
-  s.date = %q{2012-07-25}
+  s.date = %q{2012-10-03}
   s.default_executable = %q{ec2-rotate-volume-snapshots}
   s.description = %q{Provides a simple way to rotate EC2 snapshots with configurable retention periods.}
   s.email = %q{zach@zwily.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ec2-rotate-volume-snapshots
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Zach Wily
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-25 00:00:00 -06:00
+date: 2012-10-03 00:00:00 -06:00
 default_executable: ec2-rotate-volume-snapshots
 dependencies: 
 - !ruby/object:Gem::Dependency