ec2-rotate-volume-snapshots 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/ec2-rotate-volume-snapshots

@@ -64,7 +64,7 @@ end
 volume_ids = ARGV
 
 ec2 = RightAws::Ec2.new(opts[:aws_access_key], opts[:aws_secret_access_key], :region => opts[:aws_region])
-all_snapshots = ec2.describe_snapshots
+all_snapshots = ec2.describe_snapshots(:filters => { 'volume-id' => volume_ids })
 
 volume_ids.each do |volume_id|
   if volume_id !~ /^vol-/
@@ -73,6 +73,9 @@ volume_ids.each do |volume_id|
     exit 1
   end
   
+  # keep track of how many deletes we've done per throttle
+  deletes = 0
+  
   # poor man's way to get a deep copy of our time_periods definition hash
   periods = Marshal.load(Marshal.dump(time_periods))
   
@@ -114,6 +117,18 @@ volume_ids.each do |volume_id|
     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
+      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.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zach Wily"]
-  s.date = %q{2011-08-23}
+  s.date = %q{2012-06-26}
   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: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Zach Wily
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 -06:00
+date: 2012-06-26 00:00:00 -07:00
 default_executable: ec2-rotate-volume-snapshots
 dependencies: 
 - !ruby/object:Gem::Dependency