ec2launcher 1.5.2 → 1.6.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.6.0
+
+* Added option to set block device read-ahead value.
+
 ## 1.5.2
 
 * Use local copies of runurl, setup.rb and setup_instance.rb instead of pulling them down from GitHub every time.

data/lib/ec2launcher/dsl/block_device.rb

@@ -18,6 +18,7 @@ module EC2Launcher
 			dsl_accessor :raid_level
 			dsl_accessor :size
 			dsl_accessor :iops
+			dsl_accessor :block_ra
 
 			def initialize(option_hash = nil)
 				if option_hash
@@ -29,6 +30,7 @@ module EC2Launcher
 					@mount = option_hash["mount_point"]
 					@owner = option_hash["owner"]
 					@group = option_hash["group"]
+					@block_ra = option_hash["block_ra"]
 				end
 
 				# Default values
@@ -56,7 +58,8 @@ module EC2Launcher
 						"raid_level" => @raid_level,
 						"mount_point" => @mount,
 						"owner" => @owner,
-						"group" => @group
+						"group" => @group,
+						"block_ra" => @block_ra
 					}
 				}
 			end

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.5.2"
+  VERSION = "1.6.0"
 end

data/startup-scripts/setup_instance.rb

@@ -375,6 +375,11 @@ EOF
           partition_devices([ "/dev/#{next_device_name}" ])
           format_filesystem(@system_arch, "/dev/#{next_device_name}1")
         end
+        
+        if block_device.respond_to?(:block_ra) && block_device.block_ra
+          set_block_read_ahead("/dev/#{next_device_name}1", block_device.block_ra)
+        end
+
         mount_device("/dev/#{next_device_name}1", block_device.mount, block_device.owner, block_device.group, @default_fs_type)
         next_device_name.next!
       else
@@ -385,12 +390,25 @@ EOF
         end
         puts "Setting up attached raid array... system_arch = #{@system_arch}, raid_devices = #{raid_devices}, device = /dev/md#{(127 - raid_array_count).to_s}"
         raid_device_name = setup_attached_raid_array(@system_arch, raid_devices, "/dev/md#{(127 - raid_array_count).to_s}", block_device.raid_level.to_i, ! @options.clone_host.nil?)
+        
+        if block_device.respond_to?(:block_ra) && block_device.block_ra
+          raid_devices.each {|device_name| set_block_read_ahead("#{device_name}1", block_device.read_ahead) }
+          set_block_read_ahead(raid_device_name, block_device.block_ra)
+        end
+
         mount_device(raid_device_name, block_device.mount, block_device.owner, block_device.group, @default_fs_type)
         raid_array_count += 1
       end
     end
   end
 
+  def set_block_read_ahead(device_name, read_ahead = nil)
+    if read_ahead
+      puts "Setting block device read ahead to #{read_ahead} for #{device_name}"
+      puts `blockdev --setra #{read_ahead} #{device_name}`
+    end
+  end
+
   # Creates filesystem on a device
   # XFS on 64-bit
   # ext4 on 32-bit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk