CloudyScripts 1.8.33 → 1.8.34

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'CloudyScripts'
-  s.version = '1.8.33'
+  s.version = '1.8.34'
   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

@@ -563,14 +563,30 @@ module StateTransitionHelper
   # Input Parameters:
   # * mount_point => directory to be unmounted
   def unmount_fs(mount_point)
-    post_message("Going to unmount ...")
+    post_message("going to unmount #{mount_point}...")
     @logger.debug "unmount #{mount_point}"
-    remote_handler().umount(mount_point)
-    sleep(2) #give umount some time
-    if remote_handler().drive_mounted?(mount_point)
-      raise Exception.new("drive #{mount_point} not unmounted")
+
+    done = false
+    timeout = 120
+    while timeout > 0
+      res = remote_handler().umount(mount_point)
+      if !remote_handler().drive_mounted?(mount_point)
+        done = true
+        timeout = 0
+      end
+      sleep(5)
+      timeout -= 5
+    end
+    msg = ""
+    if !done
+      msg = "Failed to umount '#{mount_point}'"
+      @logger.error "#{msg}"
+      raise Exception.new("#{mount_point} still mounted")
+    else
+      msg = "#{mount_point} successfully mounted" 
+      @logger.info "#{msg}"
     end
-    post_message("device unmounted")
+    post_message("#{msg}")
   end
 
   # Get root partition label

data/lib/scripts/ec2/copy_ami.rb

@@ -193,6 +193,7 @@ class CopyAmi < Ec2Script
       #
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
       enable_ssh_tty(@context[:target_dns_name])
+      unmount_fs(dest_dir)
       disconnect()
       DataCopiedState.new(@context)
     end

data/lib/scripts/ec2/copy_snapshot.rb

@@ -172,6 +172,7 @@ class CopySnapshot< Ec2Script
       #
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
       enable_ssh_tty(@context[:target_dns_name])
+      unmount_fs(dest_dir)
       disconnect()
       DataCopiedState.new(@context)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: CloudyScripts
 version: !ruby/object:Gem::Version 
-  hash: 117
+  hash: 115
   prerelease: false
   segments: 
   - 1
   - 8
-  - 33
-  version: 1.8.33
+  - 34
+  version: 1.8.34
 platform: ruby
 authors: 
 - Matthias Jung
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-29 00:00:00 +00:00
+date: 2011-08-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency