jason-o-matic-deep_test 1.2.2.10 → 1.2.2.11

data/lib/deep_test/distributed/multi_test_server_proxy.rb

@@ -17,15 +17,38 @@ module DeepTest
 
       def sync(options)
         if options.sync_options[:push_code]
-          @slaves.each do |slave|
-            DeepTest.logger.debug "sync to: #{slave.inspect}"
-            RSync.sync(Struct.new(:address).new(URI::parse(slave.__drburi).host), options, options.mirror_path(slave.config[:work_dir]))
-          end
+          multi_push_sync(options)
         else
           DeepTest.logger.debug "dispatch sync for #{options.origin_hostname}"
           @slave_controller.dispatch(:sync, options)
         end
       end
+      
+      def multi_push_sync(options)
+        puts "Syncing..."
+        sync_start = Time.now
+        
+        threads = @slaves.map do |slave|
+          Thread.new do
+            Thread.current[:receiver] = slave
+            Timeout.timeout(options.timeout_in_seconds) do
+              RSync.sync(Struct.new(:address).new(URI::parse(slave.__drburi).host), options, options.mirror_path(slave.config[:work_dir]))
+            end
+          end
+        end
+
+        results = []
+        threads.each do |t|
+          begin
+            results << t.value
+          rescue Timeout::Error
+            DeepTest.logger.error "Timeout syncing to #{t[:receiver].__drburi}"
+            raise
+          end
+        end
+        
+        puts "Sync took #{Time.now - sync_start} seconds"
+      end
 
       class WorkerServerProxy
         

data/lib/deep_test/distributed/rsync.rb

@@ -4,8 +4,9 @@ module DeepTest
       def self.sync(connection_info, options, destination)
         command = Args.new(connection_info, options).command(destination)
         DeepTest.logger.debug("rsycing: #{command}")
-        successful = system command
-        raise "RSync Failed!!" unless successful
+        output = `#{command}`
+        raise "RSync Failed!!\nCommand failed: #{command}\nWith output:\nBEGIN#{'=' * 80}\n#{output}\nEND#{'=' * 82}" unless $?.success?
+        output
       end
 
       class Args
@@ -20,7 +21,7 @@ module DeepTest
           # The '/' after source tells rsync to copy the contents
           # of source to destination, rather than the source directory
           # itself
-          "rsync -az --delete #{@sync_options[:rsync_options]} #{source_location}/ #{destination_location(destination)}".strip.squeeze(" ")
+          "rsync -az --delete #{@sync_options[:rsync_options]} #{source_location}/ #{destination_location(destination)} 2>&1".strip.squeeze(" ")
         end
 
         def source_location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jason-o-matic-deep_test
 version: !ruby/object:Gem::Version 
-  version: 1.2.2.10
+  version: 1.2.2.11
 platform: ruby
 authors: 
 - anonymous z, Dan Manges, David Vollbracht