CloudyScripts 1.5.23 → 1.5.24

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'CloudyScripts'
-  s.version = '1.5.23'
+  s.version = '1.5.24'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
   s.summary = 'Scripts to facilitate programming for infrastructure clouds.'

data/lib/help/state_transition_helper.rb

@@ -232,23 +232,34 @@ module StateTransitionHelper
   # * temp_device_name => device name to be used for attaching (e.g. /dev/sdj1)
   def attach_volume(volume_id, instance_id, temp_device_name)
     post_message("going to attach volume #{volume_id} to instance #{instance_id} on device #{temp_device_name}...")
-    @logger.debug "attach volume #{volume_id} to instance #{instance_id} on device #{temp_device_name}"
+    @logger.info "attach volume #{volume_id} to instance #{instance_id} on device #{temp_device_name}"
     ec2_handler().attach_volume(:volume_id => volume_id,
       :instance_id => instance_id,
       :device => temp_device_name
     )
     done = false
-    while !done
-      sleep(5)
-      #TODO: check for timeout?
+    timeout = 120
+    while timeout > 0
       res = ec2_handler().describe_volumes(:volume_id => volume_id)
-      state = res['volumeSet']['item'][0]['status']
-      @logger.debug "storage attaching: #{state}"
-      if state == 'in-use'
+      vol_state = res['volumeSet']['item'][0]['status']
+      attachment_state = res['volumeSet']['item'][0]['attachmentSet']['item'][0]['status']
+      @logger.debug "storage attaching: volume state: #{vol_state}, attachment state: #{attachment_state}"
+      if vol_state == 'in-use' && attachment_state == 'attached' 
         done = true
+        timeout = 0
       end
+      sleep(5)
+      timeout -= 5
+    end
+    msg = ""
+    if !done
+      msg = "Failed to attach volume '#{volume_id}' to instance '#{instance_id}"
+      raise Exception.new("volume #{mount_point} not attached")
+    else
+      msg = "volume #{volume_id} successfully attached" 
     end
-    post_message("volume successfully attached")
+    @logger.error "#{msg}"
+    post_message("#{msg}")
   end
 
   # Detach an EBS volume from an instance.
@@ -256,22 +267,33 @@ module StateTransitionHelper
   # * volume_id => EC2 ID for the EBS Volume to be detached
   # * instance_id => EC2 ID for the instance to detach from
   def detach_volume(volume_id, instance_id)
-    post_message("going to detach volume #{volume_id}...")
-    @logger.debug "detach volume #{volume_id}"
+    post_message("going to detach volume #{volume_id} from instance #{instance_id}...")
+    @logger.info "detach volume #{volume_id} from instance #{instance_id}"
     ec2_handler().detach_volume(:volume_id => volume_id,
       :instance_id => instance_id
     )
     done = false
-    while !done
+    timeout = 120
+    while timeout > 0
       sleep(3)
-      #TODO: check for timeout?
       res = ec2_handler().describe_volumes(:volume_id => volume_id)
       @logger.debug "volume detaching: #{res.inspect}"
       if res['volumeSet']['item'][0]['status'] == 'available'
         done = true
+        timeout = 0
       end
+      sleep(5)
+      timeout -= 5
+    end
+    msg = ""
+    if !done
+      msg = "Failed to detach volume '#{volume_id}' from instance '#{instance_id}"
+      raise Exception.new("volume #{mount_point} not detached")
+    else
+      msg = "volume #{volume_id} successfully detached" 
     end
-    post_message("volume #{volume_id} detached.")
+    @logger.error "#{msg}"
+    post_message("#{msg}")
   end
 
   # Delete an EBS volume.

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: CloudyScripts
 version: !ruby/object:Gem::Version 
+  hash: 51
   prerelease: false
   segments: 
   - 1
   - 5
-  - 23
-  version: 1.5.23
+  - 24
+  version: 1.5.24
 platform: ruby
 authors: 
 - Matthias Jung
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +01:00
+date: 2011-03-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amazon-ec2
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: net-ssh
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: net-scp
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -66,20 +73,20 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- lib/cloudyscripts.rb
-- lib/help/dm_crypt_helper.rb
-- lib/help/ec2_helper.rb
-- lib/help/progress_message_listener.rb
-- lib/help/remote_command_handler.rb
-- lib/help/script_execution_state.rb
-- lib/help/state_change_listener.rb
-- lib/help/state_transition_helper.rb
+- lib/scripts/ec2/dm_encrypt.rb
 - lib/scripts/ec2/ami2_ebs_conversion.rb
 - lib/scripts/ec2/copy_ami.rb
 - lib/scripts/ec2/copy_snapshot.rb
-- lib/scripts/ec2/dm_encrypt.rb
-- lib/scripts/ec2/download_snapshot.rb
 - lib/scripts/ec2/ec2_script.rb
+- lib/scripts/ec2/download_snapshot.rb
+- lib/help/ec2_helper.rb
+- lib/help/dm_crypt_helper.rb
+- lib/help/state_transition_helper.rb
+- lib/help/script_execution_state.rb
+- lib/help/progress_message_listener.rb
+- lib/help/remote_command_handler.rb
+- lib/help/state_change_listener.rb
+- lib/cloudyscripts.rb
 has_rdoc: true
 homepage: http://elastic-security.com
 licenses: []
@@ -90,23 +97,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: cloudyscripts
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Scripts to facilitate programming for infrastructure clouds.