CloudyScripts 1.5.17 → 1.5.18

data/Rakefile

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

data/lib/help/remote_command_handler.rb

@@ -103,6 +103,21 @@ class RemoteCommandHandler
     !drive_mounted?(path)
   end
 
+  # Copy directory using basic cp
+  # exclude_path: a space separated list of directory
+  def local_rcopy(source_path, dest_path, exclude_path = nil)
+    e = ""
+    if exclude_path.nil? || exclude_path.empty? 
+      e = "cp -Rpv #{source_path} #{dest_path}"
+    else
+      # only one level of exclusion
+      exclusion_regexp = exclude_path.gsub(' ', '|')
+      e = "for dir in $(ls -d #{source_path}* | grep -E -v '#{exclusion_regexp}'); do cp -Rpv $dir #{dest_path}; done;"
+    end
+    @logger.debug "going to execute #{e}"
+    remote_exec_helper(e, nil, nil, false)
+  end
+
   # Copy directory using options -avHx
   def local_rsync(source_path, dest_path, exclude_path = nil)
     exclude = ""
@@ -151,6 +166,7 @@ class RemoteCommandHandler
   # When #raise_exception is set, an exception will be raised instead of
   # returning false.
   def remote_execute(exec_string, push_data = nil, raise_exception = false)
+    #XXX: command line: echo -e 'y' | mkfs -t ext3 /dev/sdf
     exec_string = "echo #{push_data} >tmp.txt; #{exec_string} <tmp.txt; rm -f tmp.txt" unless push_data == nil
     stdout = []
     stderr = []
@@ -213,13 +229,13 @@ class RemoteCommandHandler
           end
           ch.on_extended_data do |ch, type, data|
             stderr << data unless data == nil || stderr == nil
-            result = false
+            #result = false
           end
           ch.on_eof do |ch|
-            @logger.debug("RemoteCommandHandler.on_eof:remote end is done sending data") if debug
+            @logger.debug("RemoteCommandHandler.on_eof: remote end is done sending data") if debug
           end
           ch.on_close do |ch|
-            @logger.debug("RemoteCommandHandler.on_close:remote end is closing!") if debug
+            @logger.debug("RemoteCommandHandler.on_close: remote end is closing!") if debug
           end
           ch.on_open_failed do |ch, code, desc|
             @logger.debug("RemoteCommandHandler.on_open_failed: code=#{code} desc=#{desc}") if debug
@@ -229,6 +245,17 @@ class RemoteCommandHandler
             sleep(1)
             ch.send_data("\n")
           end
+          ch.on_request "exit-status" do |ch, data|
+            returned_code = data.read_long
+            @logger.debug("process terminated with exit-status: #{returned_code}")
+            if returned_code != 0
+              @logger.error("Remote command execution failed with code: #{returned_code}")
+              result = false
+            end
+          end
+          ch.on_request "exit-signal" do |ch, data|
+            @logger.debug("process terminated with exit-signal: #{data.read_string}")
+          end       
         else
           stderr << "the remote command could not be invoked!" unless stderr == nil
           result = false

data/lib/help/state_transition_helper.rb

@@ -242,7 +242,7 @@ module StateTransitionHelper
       res = ec2_handler().describe_volumes(:volume_id => volume_id)
       state = res['volumeSet']['item'][0]['status']
       @logger.debug "storage attaching: #{state}"
-      if  state == 'in-use'
+      if state == 'in-use'
         done = true
       end
     end
@@ -351,7 +351,10 @@ module StateTransitionHelper
   def create_fs(dns_name, device)
     post_message("going to create filesystem on #{dns_name} to #{device}...")
     @logger.debug "create filesystem on #{dns_name} to #{device}"
-    remote_handler().create_filesystem("ext3", device)
+    status = remote_handler().create_filesystem("ext3", device)
+    if status == false
+      raise Exception.new("failed to create ext3 filesystem on #{device} device on #{dns_name}")
+    end
     post_message("filesystem system successfully created")
   end
 
@@ -403,8 +406,24 @@ module StateTransitionHelper
     post_message("going to start copying files to #{destination_path}. This may take quite a time...")
     @logger.debug "start copying to #{destination_path}"
     start = Time.new.to_i
-    remote_handler().local_rsync("/", "#{destination_path}", "#{destination_path}")
-    remote_handler().local_rsync("/dev/", "#{destination_path}/dev/")
+    if remote_handler().tools_installed?("rsync")
+      @logger.debug "use rsync command line"
+      status = remote_handler().local_rsync("/", "#{destination_path}", "#{destination_path}")
+      status = remote_handler().local_rsync("/dev/", "#{destination_path}/dev/")
+      if status == false
+        raise Exception.new("failed to copy distribution remotely using rsync")
+      end
+    else
+      @logger.debug "use cp command line"
+      status = remote_handler().local_rcopy("/", "#{destination_path}", "/proc /sys /dev /mnt")
+      if status == false
+        raise Exception.new("failed to copy distribution remotely using cp")
+      end
+      status = remote_handler().mkdir("#{destination_path}/proc")
+      status = remote_handler().mkdir("#{destination_path}/sys")
+      status = remote_handler().mkdir("#{destination_path}/mnt")
+      status = remote_handler().mkdir("#{destination_path}/dev")
+    end
     endtime = Time.new.to_i
     @logger.info "copy took #{(endtime-start)}s"
     post_message("copying is done (took #{endtime-start})s")

data/lib/scripts/ec2/ami2_ebs_conversion.rb

@@ -2,6 +2,7 @@ require "help/script_execution_state"
 require "scripts/ec2/ec2_script"
 require "help/remote_command_handler"
 #require "help/dm_crypt_helper"
+require "help/ec2_helper"
 require "AWS"
 
 # Creates a bootable EBS storage from an existing AMI.
@@ -108,7 +109,8 @@ class Ami2EbsConversion < Ec2Script
   # File system created. Mount it.
   class FileSystemCreated < Ami2EbsConversionState
     def enter
-      @context[:mount_dir] = "/mnt/tmp_#{@context[:volume_id]}"
+      #@context[:mount_dir] = "/mnt/tmp_#{@context[:volume_id]}"
+      @context[:mount_dir] = "/ebs_#{@context[:volume_id]}"
       mount_fs(@context[:mount_dir], @context[:temp_device_name])
       FileSystemMounted.new(@context)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 17
-  version: 1.5.17
+  - 18
+  version: 1.5.18
 platform: ruby
 authors: 
 - Matthias Jung
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +02:00
+date: 2010-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency