ironfan 4.8.2 → 4.8.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v4.8.3
+* Bogus servers should not be killable (fixes #250)
+* Style guide corrections ('&&', not 'and'; don't use single-letter variable names)
+* Also fixed a thing where security groups enumeration would die if a bogus server existed that's bit me before
+* Reviewed other knife cluster commands and made them not tolerate bogosity either
+
 # v4.8.2
 * Launch EBS-optimized boxen on EC2
 

data/VERSION

@@ -1 +1 @@
-4.8.2
+4.8.3

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.8.2"
+  s.version = "4.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-02-21"
+  s.date = "2013-02-26"
   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/chef/knife/cluster_bootstrap.rb

@@ -62,7 +62,6 @@ class Chef
         ensure_common_environment(target)
         # Execute across all servers in parallel
         Ironfan.parallel(target.values) {|computer| run_bootstrap(computer)}
-#         threads = target.servers.map{ |server| Thread.new(server) { |svr| run_bootstrap(svr, svr.public_hostname) } }
       end
 
       def confirm_execution(target)

data/lib/chef/knife/cluster_start.rb

@@ -24,7 +24,7 @@ class Chef
       import_banner_and_options(Ironfan::Script)
 
       def relevant?(server)
-        server.stopped?
+        (not bogus?) && stopped?
       end
 
       def perform_execution(target)

data/lib/chef/knife/cluster_stop.rb

@@ -24,7 +24,7 @@ class Chef
       import_banner_and_options(Ironfan::Script)
 
       def relevant?(server)
-        server.running?
+        (not bogus?) && server.running?
       end
 
       def perform_execution(target)

data/lib/chef/knife/ironfan_knife_common.rb

@@ -84,19 +84,18 @@ module Ironfan
     #
     def get_relevant_slice( *predicate )
       full_target = get_slice( *predicate )
-      display(full_target) do |m|
-        rel = relevant?(m)
-        { :relevant? => (rel ? "[blue]#{rel}[reset]" : '-' ) }
+      display(full_target) do |mach|
+        rel = relevant?(mach)
+        { :relevant? => (rel ? "[green]#{rel}[reset]" : '-' ) }
       end
-      full_target.select{|m| relevant?(m) }
+      full_target.select{|mach| relevant?(mach) }
     end
 
     # passes target to Broker::Conductor#display, will show headings in server slice
     # tables based on the --verbose flag
     def display(target, display_style=nil, &block)
       display_style ||= (config[:verbosity] == 0 ? :default : :expanded)
-#       target.display(ui, display_style, &block)
-      broker.display(target, display_style)
+      broker.display(target, display_style, &block)
     end
 
     #

data/lib/ironfan/broker/computer.rb

@@ -17,11 +17,11 @@ module Ironfan
         super
         providers[:chef] ||=    Ironfan::Provider::ChefServer
         return unless server
-        providers[:iaas] =      server.selected_cloud.provider
-        volumes =               server.volumes.values
-        volumes +=              server.implied_volumes
-        volumes.each { |v| self.drive v.name, :volume => v }
-      rescue StandardError => err ; err.polish("#{self.class} on #{args}'") rescue nil ; raise
+        providers[:iaas]   = server.selected_cloud.provider
+        volumes            = server.volumes.values
+        volumes           += server.implied_volumes
+        volumes.each{|vol| self.drive vol.name, :volume => vol }
+      rescue StandardError => err ; err.polish("#{self.class} on '#{args.inspect}'") rescue nil ; raise
       end
 
       def name
@@ -38,11 +38,11 @@ module Ironfan
           res.expected_ids(self).each do |id|
             next unless res.recall? id
 
-            recalled =            res.recall id
-            recalled.users <<     self
+            recalled =  res.recall id
+            recalled.users << self
 
-            target =              res.resource_type.to_s
-            target +=             "__#{id}" if res.multiple?
+            target  = res.resource_type.to_s
+            target += "__#{id}" if res.multiple?
             self[target.to_sym] = recalled
 
             recalled.on_correlate(self)
@@ -130,14 +130,6 @@ module Ironfan
         @chef_client_script_content = Ironfan.safely{ File.read(script_filename) }
       end
 
-#       def ensure_resource(type)
-#         if type.multiple?
-#           existing = resources[type.resource_id]
-#         else
-#
-#         end
-#       end
-
       #
       # Display
       #
@@ -200,7 +192,7 @@ module Ironfan
         self[:machine] = value
       end
       def dns_name         ; machine? ? machine.dns_name : nil ; end
-      def bootstrap_distro ; (server && server.selected_cloud) ? server.selected_cloud.bootstrap_distro   : nil ; end
+      def bootstrap_distro ; (server && server.selected_cloud) ? server.selected_cloud.bootstrap_distro : nil ; end
 
       def keypair
         resources[:keypair]
@@ -225,16 +217,16 @@ module Ironfan
         not client.nil?
       end
       def created?
-        machine? and machine.created?
+        machine? && machine.created?
       end
       def machine?
         not machine.nil?
       end
       def killable?
-        not permanent? and (node? || client? || created?)
+        (not bogus?) && (not permanent?) && (node? || client? || created?)
       end
       def launchable?
-        not bogus? and not created?
+        (not bogus?) && (not created?)
       end
       def node?
         not node.nil?
@@ -245,13 +237,13 @@ module Ironfan
         [true, :true, 'true'].include? server.selected_cloud.permanent
       end
       def running?
-        machine? and machine.running?
+        machine? && machine.running?
       end
       def server?
         not server.nil?
       end
       def stopped?
-        machine? and machine.stopped?
+        machine? && machine.stopped?
       end
 
       # @return [Boolean] true if machine is likely to be reachable by ssh
@@ -295,15 +287,15 @@ module Ironfan
 
       def validate
         computers = self
-        values.each{|c|    c.validate }
+        values.each{|c| c.validate }
         values.map {|c| c.providers.values}.flatten.uniq.each {|p| p.validate computers }
       end
 
       def group_action(verb)
         computers = self
-        provider_keys = values.map {|c| c.chosen_providers({ :providers => :iaas })}.flatten.uniq
-        providers     = provider_keys.map { |pk| values.map { |c| c.providers[pk] } }.flatten.compact.uniq
-        providers.each { |p| p.send(verb, computers) }
+        provider_keys = values.map{|c| c.chosen_providers({ :providers => :iaas })}.flatten.uniq
+        providers     = provider_keys.map{|pk| values.map{|c| c.providers[pk] } }.flatten.compact.uniq
+        providers.each{|p| p.send(verb, computers) }
       end
 
       def prepare
@@ -318,19 +310,19 @@ module Ironfan
       # Manipulation
       #
       def kill(options={})
-        Ironfan.parallel(values) {|c| c.kill(options) }
+        Ironfan.parallel(values){|cc| cc.kill(options) }
       end
       def launch
-        Ironfan.parallel(values) {|c| c.launch }
+        Ironfan.parallel(values){|cc| cc.launch }
       end
       def save(options={})
-        Ironfan.parallel(values) {|c| c.save(options) }
+        Ironfan.parallel(values){|cc| cc.save(options) }
       end
       def start
-        Ironfan.parallel(values) {|c| c.start }
+        Ironfan.parallel(values){|cc| cc.start }
       end
       def stop
-        Ironfan.parallel(values) {|c| c.stop }
+        Ironfan.parallel(values){|cc| cc.stop }
       end
 
       def environments
@@ -351,7 +343,7 @@ module Ironfan
       # Return the selection inside another Computers collection
       def select(&block)
         result = empty_copy
-        values.select(&block).each{|m| result << m}
+        values.select(&block).each{|mach| result << mach}
         result
       end
 
@@ -363,16 +355,14 @@ module Ironfan
 
       # Find all selected computers, as well as any bogus computers from discovery
       def slice(facet_name=nil, slice_indexes=nil)
-        return self if (facet_name.nil? and slice_indexes.nil?)
-        result          = empty_copy
+        return self if (facet_name.nil? && slice_indexes.nil?)
         slice_array     = build_slice_array(slice_indexes)
-        each do |m|
-          result << m if (m.bogus? or (                 # bogus computer or
-            ( m.server.facet_name == facet_name ) and   # facet match and
-              ( slice_array.include? m.server.index or  #   index match or
-                slice_indexes.nil? ) ) )                #   no indexes specified
+        select do |mach|
+          mach.bogus? or (
+            # facet match, and index match (or no indexes specified)
+            (mach.server.facet_name == facet_name) &&
+            (slice_array.include?(mach.server.index) || slice_indexes.nil?))
         end
-        result
       end
 
       def build_slice_array(slice_indexes)

data/lib/ironfan/broker.rb

@@ -31,11 +31,15 @@ module Ironfan
     end
 
     def display(computers,style)
-      defined_data = computers.map {|m| m.to_display(style) }
+      defined_data = computers.map do |mach|
+        hsh = mach.to_display(style)
+        hsh.merge!(yield(mach)) if block_given?
+        hsh
+      end
       if defined_data.empty?
         ui.info "Nothing to report"
       else
-        headings = defined_data.map{|r| r.keys}.flatten.uniq
+        headings = defined_data.map{|hsh| hsh.keys }.flatten.uniq
         Formatador.display_compact_table(defined_data, headings.to_a)
       end
     end

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

@@ -19,6 +19,7 @@ module Ironfan
         def self.multiple?()    true;   end
         def self.resource_type()        :security_group;   end
         def self.expected_ids(computer)
+          return unless computer.server
           ec2 = computer.server.cloud(:ec2)
           ec2.security_groups.keys.map { |name| group_name_with_vpc(name,ec2.vpc) }.uniq
         end
@@ -73,7 +74,7 @@ module Ironfan
           # First, deduce the list of all groups to which at least one instance belongs
           # We'll use this later to decide whether to create groups, or authorize access,
           # using a VPC security group or an EC2 security group.
-          groups_that_should_exist = computers.map { |c| expected_ids(c) }.flatten.sort.uniq
+          groups_that_should_exist = computers.map{|comp| expected_ids(comp) }.flatten.compact.sort.uniq
           groups_to_create << groups_that_should_exist
 
           computers.select { |computer| Ec2.applicable computer }.each do |computer|

data/notes/Home.md

@@ -44,6 +44,11 @@ Ironfan consists of the following toolset:
 * [ironfan issues](https://github.com/infochimps-labs/ironfan/issues): bugs, questions and feature requests for *any* part of the Ironfan toolset.
 * [ironfan gem docs](http://rdoc.info/gems/ironfan): rdoc docs for Ironfan
 
+
+<a name="documentation"></a>
+### Documentation
+* [EC2 Instance Pricing and Capacity Reference](https://github.com/infochimps-labs/ironfan/wiki/ec2-pricing_and_capacity) * [EC2 Pricing and Capacity Spreadsheet](https://github.com/infochimps-labs/ironfan/wiki/ec2-pricing_and_capacity.numbers) -- source data, and calculations for Hadoop tunables
+
 __________________________________________________________________________
 __________________________________________________________________________
 __________________________________________________________________________

data/notes/ec2-pricing_and_capacity.md

@@ -1,25 +1,31 @@
 ## Compute Costs
 
 
-    code         	$/mo	 $/day	 $/hr	Mem/$	CPU/$	  mem 	  cpu 	cores	cpcore	storage	 disks	 bits	ebs-opt	IO
-    t1.micro       	  15	  0.48	  .02	   13	   13	  0.61	  0.25	 0.25	  1   	      0	     0	   32	    -	Low
-    m1.small       	  47	  1.56	  .065	   26	   15	  1.7 	  1   	 1   	  1   	    160	     1	   32	    -	Moderate
-    m1.medium      	  95	  3.12	  .13 	   15	   15	  3.75	  2   	 2   	  1   	    410	     1	   32	    -	Moderate
-    c1.medium      	 124	  4.08	  .165	   10	   30	  1.7 	  5   	 2   	  2.5 	    350	     1	   32	    -	Moderate
-    m1.large       	 190	  6.24	  .26 	   29	   15	  7.5 	  4   	 2   	  2   	    850	     2	   64	  500	High
-    m2.xlarge      	 329	 10.80	  .45 	   38	   14	 17.1 	  6.5 	 2   	  3.25	    420	     1	   64	    -	Moderate
-    m1.xlarge      	 380	 12.48	  .52 	   29	   15	 15   	  8   	 4   	  2   	   1690	     4	   64	 1000	High
-    m3.xlarge      	 424	 13.92	  .58	   26	   22	 15   	 13   	 4   	  3.25	      0	     0	   64	    -	Moderate
-    c1.xlarge      	 482	 15.84	  .66	   11	   30	  7   	 20   	 8   	  2.5 	   1690	     4	   64	    -	High
-    m2.2xlarge     	 658	 21.60	  .90	   38	   14	 34.2 	 13   	 4   	  3.25	    850	     2	   64	    -	High
-    m3.2xlarge     	 847	 27.84	 1.16	   26	   22	 30   	 26   	 8   	  3.25	      0	     0	   64	    -	High
-    cc1.4xlarge    	 950	 31.20	 1.30	   18	   26	 23   	 33.5 	 8   	  4.2 	   1690	     4	   64	    -	10GB
-    m2.4xlarge     	1315	 43.20	 1.80	   38	   14	 68.4 	 26   	 8   	  3.25	   1690	     2	   64	 1000	High
-    cg1.4xlarge    	1534	 50.40	 2.10	   10	   16	 22   	 33.5 	 8   	  4.2 	   1690	     4	   64	    -	10GB
-    cc2.8xlarge    	1753	 57.60	 2.40	   25	   37	 60.5 	 88   	16   	  5.5 	   3370	     2	   64	    -	10GB
-    hi1.4xlarge    	2265	 74.40	 3.10	   20	   11	 60.5 	 35   	16   	  2.2 	   2048	 ssd 2	   64	    -	10GB
-    cr1.8xlarge    	2557	 84.00	 3.50	   70	   25	244   	 88   	16   	  5.5 	    240	 ssd 2	   64	    -	10GB
-    hs1.8xlarge    	3361	110.40	 4.60	   25	    8	117   	 35   	16    	  2.2 	  49152	    24	   64	    -	10GB
+    code         	$/mo	 $/day	 $/hr	Mem/$	CPU/$	  mem 	  cpu 	cores	cpcore	storage	 disks	ebs-opt	IO
+    t1.micro		  15	  0.48	  .02	   31	   13	   .61	  0.25	  1	 0.25	      -	     0	 	Lo      
+    m1.small		  44	  1.44	  .06	   28	   17	  1.7 	  1	  1	 1	    160	     1	 	Med	
+    m1.medium		  88	  2.88	  .12	   31	   17	  3.75	  2	  2	 1	    410	     1	 	Med	
+    c1.medium		 106	  3.48	  .15	   12	   34	  1.7 	  5	  2	 2.5	    350	     1	 	Med	
+    m1.large		 175	  5.76	  .24	   31	   17	  7.5 	  4	  2	 2	    850	     2	 	Hi	
+    m1.lg+ebs		 194	  6.36	  .27	   28	   15	  7.5 	  4	  2	 2	    850	     2	  500	Hi+EBS	
+    m2.xlarge		 300	  9.84	  .41	   42	   16	 17.1 	  6.5	  2	 3.25	    420	     1	 	Med	
+    m1.xlarge		 351	 11.52	  .48	   31	   17	 15.  	  8	  4	 2	   1690	     4	 	Hi	
+    m3.xlarge		 365	 12.00	  .50	   30	   26	 15.  	 13	  4	 3.25	      -	     0	 	Med	
+    m1.xl+ebs		 387	 12.72	  .53	   28	   15	 15.  	  8	  4	 2	   1690	     4	 1000	Hi+EBS	
+    c1.xlarge		 424	 13.92	  .58	   12	   34	  7.  	 20	  8	 2.5	   1690	     4	  	Hi	
+    m2.2xlarge		 599	 19.68	  .82	   42	   16	 34.2 	 13	  4	 3.25	    850	     2	 	Hi	
+    m3.2xlarge		 731	 24.00	 1.00	   30	   26	 30.  	 26	  8	 3.25	      -	     0	 	Hi	
+    cc1.4xlarge		 950	 31.20	 1.30	   18	   26	 23.  	 33.5	  8	 4.2	   1690	     4	 	10gb	
+    m2.4xlarge		1198	 39.36	 1.64	   42	   16	 68.4 	 26	  8	 3.25	   1690	     2	 	Hi	
+    m2.4xl+ebs		1235	 40.56	 1.69	   40	   15	 68.4 	 26	  8	 3.25	   1690	     2	 1000	Hi+EBS	
+    cg1.4xlarge		1534	 50.40	 2.10	   10	   16	 22.  	 33.5	  8	 4.2	   1690	     4	 	10gb	
+    cc2.8xlarge		1753	 57.60	 2.40	   25	   37	 60.5 	 88	 16	 5.5	   3370	     2	 	10gb	
+    hi1.4xlarge		2265	 74.40	 3.10	   20	   11	 60.5 	 35.2	 16	 2.2	   2048	 ssd 2	 	10gb	
+    cr1.8xlarge		2557	 84.00	 3.50	   70	   25	244.  	 88	 16	 5.5	    240	 ssd 2	 	10gb	
+    hs1.8xlarge		3361	110.40	 4.60	   25	    8	117.  	 35	 16	 2.2	  49152	    24	 	10gb	
+
+Prices are for standard (non-reserved) instances. EBS-optimized instances are listed on their own line.
+
 
 ## Storage Costs
 

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.8.2
+  version: 4.8.3
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-21 00:00:00 Z
+date: 2013-02-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -284,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1631771956177080084
+      hash: 4061434417282222505
       segments: 
       - 0
       version: "0"