ironfan 4.0.1 → 4.0.2

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# v4.0.2: Parallel calls working once more
+* Added Ironfan.parallelize, to run the basic cluster commands in parallel against their servers
+* Make security_group range and group authorizations store only unique values
+
+# v4.0.1: Minor bug-fixes
+* Don't attempt to correlate the node volumes hash unless it's set
+* RaidGroup declared by the DSL should get a name (so it can be indexed correctly)
+* Volume.defaults is deprecated
+
 # v4.0.0:  Major refactoring to allow multicloud support
 * First pass at a provider plugin API, with EC2 as the working example.
 * Removed role_implications: these can be handled by explicit ec2.security_group calls for now. See https://github.com/infochimps-labs/ironfan/wiki/Upgrading-to-v4 for more details.

data/VERSION

@@ -1 +1 @@
-4.0.1
+4.0.2

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.0.1"
+  s.version = "4.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-09-06"
+  s.date = "2012-09-07"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/ironfan/broker/computer.rb

@@ -237,7 +237,7 @@ module Ironfan
       # Discovery
       #
       def correlate
-        values.each {|computer| computer.correlate }
+        Ironfan.delegate_to(values)     { correlate }
       end
 
       def validate
@@ -252,21 +252,25 @@ module Ironfan
       # Manipulation
       #
       def kill(options={})
-        Ironfan.delegate_to(values)     { kill(options) }
+        Ironfan.parallelize(values) { kill(options) }
       end
       def launch
-        Ironfan.delegate_to(values)     { launch }
+        Ironfan.parallelize(values) { launch }
       end
       def save(options={})
-        Ironfan.delegate_to(values)     { save(options) }
+        Ironfan.parallelize(values) { save(options) }
       end
       def start
-        Ironfan.delegate_to(values)     { start }
+        Ironfan.parallelize(values) { start }
       end
       def stop
-        Ironfan.delegate_to(values)     { stop }
+        Ironfan.parallelize(values) { stop }
       end
 
+      #
+      # Utility
+      #
+
       # set up new computers for each server in the cluster definition
       def create_expected!
         self.cluster.servers.each do |server|
@@ -306,7 +310,7 @@ module Ironfan
         eval("[#{slice_indexes}]").map {|idx| idx.class == Range ? idx.to_a : idx}.flatten
       end
 
-      # Utility function to provide a human-readable list of names
+      # provide a human-readable list of names
       def joined_names
         values.map(&:name).join(", ").gsub(/, ([^,]*)$/, ' and \1')
       end

data/lib/ironfan/dsl/ec2.rb

@@ -103,11 +103,13 @@ module Ironfan
           range = (range .. range) if range.is_a?(Integer)
           range_authorizations << [range, cidr_ip, ip_protocol]
           range_authorizations.compact!
+          range_authorizations.uniq!
         end
 
         def authorized_by_group(other_name)
           group_authorized_by << other_name.to_s
           group_authorized_by.compact!
+          group_authorized_by.uniq!
         end
       end
 

data/lib/ironfan/provider/ec2/security_group.rb

@@ -37,7 +37,7 @@ module Ironfan
           return unless Ec2.applicable computer
  
           ensure_groups(computer)
-          groups = computer.server.cloud(:ec2).security_groups.keys.map{|k| k.to_s}.uniq
+          groups = self.expected_ids(computer)
           # Only handle groups that don't already exist
           groups.delete_if {|group| recall? group.to_s }
           return if groups.empty?

data/lib/ironfan.rb

@@ -24,11 +24,21 @@ module Ironfan
   def self.chef_config=(cc) @chef_config = cc ; end
   def self.chef_config()    @chef_config      ; end
 
-# simple delegation to multiple targets
+  # simple delegation to multiple targets
   def self.delegate_to(targets,options={},&block)
     raise 'missing block' unless block_given?
     [targets].flatten.each {|target| target.instance_eval &block }
   end
+
+  # delegate to multiple targets in parallel
+  def self.parallelize(targets,options={},&block)
+    raise 'missing block' unless block_given?
+    [targets].flatten.map do |t|
+      sleep(0.1) # avoid hammering with simultaneous requests
+      Thread.new(t) {|t| t.instance_eval &block }
+    end.each(&:join)
+  end
+
   #
   # Defines a cluster with the given name.
   #

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-06 00:00:00 Z
+date: 2012-09-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -232,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4333308568630839525
+      hash: 318287528418950841
       segments: 
       - 0
       version: "0"