syncwrap 1.5.1 → 1.5.2

data/History.rdoc

@@ -1,3 +1,12 @@
+=== 1.5.2 (2013-4-10)
+* Add check for init, aws_configure only if aws_config_json file
+  exists.
+* Generalize waiting for created/terminated AWS resources, including
+  better diagnostic output.
+* Add missing wait for EBS volume creation.
+* Add default wait for Route53 CNAME creation, using current
+  authoritative Amazon name server.
+
 === 1.5.1 (2013-4-3)
 * Include syncwrap/aws.rb for real.
 
@@ -20,7 +29,7 @@
   may already be installed)
 
 === 1.3.0 (2012-10-4)
-* Include RHEL/Amazon Linux Postgresql 9.1 config and deploy support
+* Include RHEL/Amazon Linux PostgreSQL 9.1 config and deploy support
   and reorganize for Ubuntu support as well. Default deploy data dir
   is now /pg/data which makes sense for an EBS mount. Config is
   further tuned for EBS.  PostgreSQL::EC2 has been dropped.

data/lib/syncwrap/aws.rb

@@ -16,6 +16,7 @@
 
 require 'json'
 require 'aws-sdk'
+require 'resolv'
 
 require 'syncwrap/common'
 
@@ -55,6 +56,10 @@ module SyncWrap::AWS
   # Default options for Route53 record set creation
   attr_accessor :route53_default_rs_options
 
+  # DNS Resolver options for testing Route53 (default: Use public
+  # google name servers to avoid local negative caching)
+  attr_accessor :resolver_options
+
   def initialize
     @aws_config_json   = 'private/aws.json'
     @aws_regions       = %w[ us-east-1 ]
@@ -72,11 +77,18 @@ module SyncWrap::AWS
       :region          => 'us-east-1'
     }
 
-    @route53_default_rs_options = {}
+    @route53_default_rs_options = {
+      :ttl => 300,
+      :wait => true
+    }
+
+    @resolver_options = {
+      :nameserver => [ '8.8.8.8', '8.8.4.4' ]
+    }
 
     super
 
-    aws_configure
+    aws_configure if File.exist?( @aws_config_json )
     aws_read_instances if File.exist?( @aws_instances_json )
   end
 
@@ -150,10 +162,13 @@ module SyncWrap::AWS
 
       attachments = opts[ :ebs_volumes ].times.map do |i|
         vol = ec2.volumes.create( vopts )
+        wait_until( vol.id, 0.5 ) { vol.status == :available }
         vol.attach_to( inst, "/dev/sdh#{i+1}" ) #=> Attachment
       end
 
-      sleep 1 while attachments.any? { |a| a.status == :attaching }
+      wait_until( "volumes to attach" ) do
+        !( attachments.any? { |a| a.status == :attaching } )
+      end
     end
 
     iprops = aws_instance_to_props( region, inst )
@@ -168,18 +183,38 @@ module SyncWrap::AWS
   #
   # :domain_name:: name of the hosted zone and suffix for
   #                CNAME. Should terminate in a DOT '.'
+  # :wait::        If true, wait for CNAME to resolve
   def route53_create_host_cname( iprops, opts = {} )
     opts = deep_merge_hashes( @route53_default_rs_options, opts )
-    dname = opts.delete( :domain_name ) #with terminal '.'
-    rs_opts =
-      { :ttl => 300 }.
-      merge( opts ).
-      merge( :resource_records => [ { :value => iprops[:internet_name] } ] )
+    dname = dot_terminate( opts.delete( :domain_name ) )
+    do_wait = opts.delete( :wait )
+    rs_opts = opts.
+      merge( :resource_records => [ {:value => iprops[:internet_name]} ] )
 
     r53 = AWS::Route53.new
     zone = r53.hosted_zones.find { |hz| hz.name == dname } or
       raise "Route53 Hosted Zone name #{dname} not found"
-    zone.rrsets.create( [ iprops[:name], dname ].join('.'), 'CNAME', rs_opts )
+    long_name = [ iprops[:name], dname ].join('.')
+    zone.rrsets.create( long_name, 'CNAME', rs_opts )
+    wait_for_dns_resolve( long_name, dname ) if do_wait
+  end
+
+  def wait_for_dns_resolve( long_name,
+                            domain,
+                            rtype = Resolv::DNS::Resource::IN::CNAME )
+
+    ns_addr = Resolv::DNS.open( @resolver_options ) do |rvr|
+      ns_n = rvr.getresource( domain, Resolv::DNS::Resource::IN::SOA ).mname
+      rvr.getaddress( ns_n ).to_s
+    end
+
+    sleep 3 # Initial wait
+
+    wait_until( "#{long_name} to resolve", 3.0 ) do
+      Resolv::DNS.open( :nameserver => ns_addr ) do |rvr|
+        rvr.getresources( long_name, rtype ).first
+      end
+    end
   end
 
   # Terminates an instance and permanently deletes any EBS volumes
@@ -200,9 +235,8 @@ module SyncWrap::AWS
       end
     end.compact
 
-    puts "Terminating instance #{inst.id}"
     inst.terminate
-    sleep 1 while inst.status != :terminated
+    wait_until( "termination of #{inst.id}", 2.0 ) { inst.status == :terminated }
 
     ebs_volumes = ebs_volumes.map do |vid|
       volume = ec2.volumes[ vid ]
@@ -215,8 +249,9 @@ module SyncWrap::AWS
     end.compact
 
     ebs_volumes.each do |vol|
-      puts "Deleting vol #{vol.id} (#{vol.status})"
-      sleep 1 until vol.status == :available || vol.status == :deleted
+      wait_until( "deletion of vol #{vol.id}" ) do
+        vol.status == :available || vol.status == :deleted
+      end
       vol.delete if vol.status == :available
     end
 
@@ -254,13 +289,9 @@ module SyncWrap::AWS
   end
 
   def wait_for_running( inst )
-    while ( stat = inst.status ) == :pending
-      puts "Waiting 1s for instance to run"
-      sleep 1
-    end
-    unless stat == :running
-      raise "Instance #{inst.id} has status #{stat}"
-    end
+    wait_until( "instance #{inst.id} to run", 2.0 ) { inst.status != :pending }
+    stat = inst.status
+    raise "Instance #{inst.id} has status #{stat}" unless stat == :running
     nil
   end
 
@@ -397,4 +428,21 @@ module SyncWrap::AWS
     sudo cmd
   end
 
+  # Wait until block returns truthy, sleeping for freq seconds between
+  # attempts. Writes desc and a sequence of DOTs on a single line
+  # until complete.
+  def wait_until( desc, freq = 1.0 )
+    $stdout.write( "Waiting for " + desc )
+    until (ret = yield) do
+      $stdout.write '.'
+      sleep freq
+    end
+    ret
+  ensure
+    puts
+  end
+
+  def dot_terminate( name )
+    ( name =~ /\.$/ ) ? name : ( name + '.' )
+  end
 end

data/lib/syncwrap/base.rb

@@ -15,5 +15,5 @@
 #++
 
 module SyncWrap
-  VERSION='1.5.1'
+  VERSION='1.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syncwrap
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4463767626501128078
+      hash: -2508006048029112256
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4463767626501128078
+      hash: -2508006048029112256
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25