From d87af93cecc73abe7f6fd7a856ddd993290ae965 Mon Sep 17 00:00:00 2001
From: nick <nick@bytemark.co.uk>
Date: Tue, 24 Sep 2013 10:11:40 +0100
Subject: [PATCH] tests: Add a migration test with many clients connecting in
 two waves

---
 .../acceptance/test_write_during_migration.rb | 83 ++++++++++++-------
 1 file changed, 52 insertions(+), 31 deletions(-)

diff --git a/tests/acceptance/test_write_during_migration.rb b/tests/acceptance/test_write_during_migration.rb
index 502c448..e89c9a7 100755
--- a/tests/acceptance/test_write_during_migration.rb
+++ b/tests/acceptance/test_write_during_migration.rb
@@ -96,55 +96,76 @@ class TestWriteDuringMigration < Test::Unit::TestCase
       dst_result = Process::waitpid2(@dst_proc)
       src_result = Process::waitpid2(@src_proc)
     end
-
   end
 
+  def source_writer
+    client = FlexNBD::FakeSource.new( "127.0.0.1", @source_port, "Timed out connecting" )
+    offsets = Range.new(0, (@size - @write_data.size) / 4096 ).to_a
+    loop do
+      begin
+        client.write(offsets[rand(offsets.size)] * 4096, @write_data)
+      rescue => err
+        # We expect a broken write at some point, so ignore it
+        break
+      end
+    end
+  end
+
+  def assert_both_sides_identical
+    # puts `md5sum #{@source_file} #{@dest_file}`
+
+    # Ensure each block matches
+    File.open(@source_file, "r") do |source|
+      File.open(@dest_file, "r") do |dest|
+        0.upto( @size / 4096 ) do |block_num|
+          s_data = source.read( 4096 )
+          d_data = dest.read( 4096 )
+
+          assert s_data == d_data, "Block #{block_num} mismatch!"
+
+          source.seek( 4096, IO::SEEK_CUR )
+          dest.seek( 4096, IO::SEEK_CUR )
+        end
+      end
+    end
+  end
 
   def test_write_during_migration
-
     Dir.mktmpdir() do |tmpdir|
       Dir.chdir( tmpdir ) do
         make_files()
 
         launch_servers()
 
-        src_writer = Thread.new do
-          client = FlexNBD::FakeSource.new( "127.0.0.1", @source_port, "Timed out connecting" )
-          offsets = Range.new(0, (@size - @write_data.size) / 4096 ).to_a
-          loop do
-            begin
-              client.write(offsets[rand(offsets.size)] * 4096, @write_data)
-            rescue => err
-              # We expect a broken write at some point, so ignore it
-              break
-            end
-          end
-        end
+        src_writer = Thread.new { source_writer }
 
         start_mirror()
         wait_for_quit()
         src_writer.join
-
-        # puts `md5sum #{@source_file} #{@dest_file}`
-
-        # Ensure each block matches
-        File.open(@source_file, "r") do |source|
-          File.open(@dest_file, "r") do |dest|
-            0.upto( @size / 4096 ) do |block_num|
-              s_data = source.read( 4096 )
-              d_data = dest.read( 4096 )
-
-              assert s_data == d_data, "Block #{block_num} mismatch!"
-
-              source.seek( 4096, IO::SEEK_CUR )
-              dest.seek( 4096, IO::SEEK_CUR )
-            end
-          end
-        end
+        assert_both_sides_identical
       end
     end
   end
 
+  def test_many_clients_during_migration
+    Dir.mktmpdir() do |tmpdir|
+      Dir.chdir( tmpdir ) do
+        make_files()
+
+        launch_servers()
+
+        src_writers_1 = (1..5).collect { Thread.new { source_writer } }
+
+        start_mirror()
+
+        src_writers_2 = (1..5).collect { Thread.new { source_writer } }
+
+        wait_for_quit()
+        ( src_writers_1 + src_writers_2 ).each {|t| t.join }
+        assert_both_sides_identical
+      end
+    end  end
+
 
 end