mongo 1.5.2 → 1.6.0

data/test/replica_sets/refresh_test.rb

@@ -3,14 +3,13 @@ require './test/replica_sets/rs_test_helper'
 require 'benchmark'
 
 class ReplicaSetRefreshTest < Test::Unit::TestCase
-  include ReplicaSetTest
 
   def setup
-    @conn = nil
+    ensure_rs
   end
 
   def teardown
-    self.rs.restart_killed_nodes
+    @rs.restart_killed_nodes
     @conn.close if @conn
   end
 
@@ -18,17 +17,11 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
     Benchmark.bm do |x|
       x.report("Connect") do
         10.times do
-          ReplSetConnection.new([self.rs.host, self.rs.ports[0]],
-                                [self.rs.host, self.rs.ports[1]],
-                                [self.rs.host, self.rs.ports[2]],
-                                :refresh_mode => false)
+          ReplSetConnection.new(build_seeds(3), :refresh_mode => false)
         end
       end
 
-          @con = ReplSetConnection.new([self.rs.host, self.rs.ports[0]],
-                                       [self.rs.host, self.rs.ports[1]],
-                                       [self.rs.host, self.rs.ports[2]],
-                                       :refresh_mode => false)
+      @con = ReplSetConnection.new(build_seeds(3), :refresh_mode => false)
 
       x.report("manager") do
         man = Mongo::PoolManager.new(@con, @con.seeds)
@@ -40,13 +33,11 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
   end
 
   def test_connect_and_manual_refresh_with_secondaries_down
-    self.rs.kill_all_secondaries
+    @rs.kill_all_secondaries
+    sleep(4)
 
     rescue_connection_failure do
-      @conn = ReplSetConnection.new([self.rs.host, self.rs.ports[0]],
-                                    [self.rs.host, self.rs.ports[1]],
-                                    [self.rs.host, self.rs.ports[2]],
-                                    :refresh_mode => false)
+      @conn = ReplSetConnection.new(build_seeds(3), :refresh_mode => false)
     end
 
     assert_equal [], @conn.secondaries
@@ -59,7 +50,7 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
     assert @conn.connected?
     assert_equal @conn.read_pool, @conn.primary_pool
 
-    self.rs.restart_killed_nodes
+    @rs.restart_killed_nodes
     assert_equal [], @conn.secondaries
     assert @conn.connected?
     assert_equal @conn.read_pool, @conn.primary_pool
@@ -71,14 +62,12 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
   end
 
   def test_automated_refresh_with_secondaries_down
-    self.rs.kill_all_secondaries
-
+    @rs.kill_all_secondaries
+    sleep(4)
+    
     rescue_connection_failure do
-      @conn = ReplSetConnection.new([self.rs.host, self.rs.ports[0]],
-                                    [self.rs.host, self.rs.ports[1]],
-                                    [self.rs.host, self.rs.ports[2]],
-                                    :refresh_interval => 2,
-                                    :refresh_mode => :sync)
+      @conn = ReplSetConnection.new(build_seeds(3),
+        :refresh_interval => 2, :refresh_mode => :sync)
     end
 
     assert_equal [], @conn.secondaries
@@ -86,7 +75,7 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
     assert_equal @conn.read_pool, @conn.primary_pool
     old_refresh_version = @conn.refresh_version
 
-    self.rs.restart_killed_nodes
+    @rs.restart_killed_nodes
     sleep(4)
     @conn['foo']['bar'].find_one
     @conn['foo']['bar'].insert({:a => 1})
@@ -98,18 +87,34 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
     assert @conn.read_pool != @conn.primary_pool,
       "Read pool and primary pool are identical."
   end
+  
+  def test_automated_refresh_when_secondary_goes_down
+    @conn = ReplSetConnection.new(build_seeds(3),
+      :refresh_interval => 2, :refresh_mode => :sync)
+
+    num_secondaries = @conn.secondary_pools.length
+    old_refresh_version = @conn.refresh_version
+
+    n = @rs.kill_secondary
+    sleep(4)
+    @conn['foo']['bar'].find_one
+
+    assert @conn.refresh_version > old_refresh_version,
+      "Refresh version hasn't changed."
+    assert_equal num_secondaries - 1, @conn.secondaries.length
+    assert_equal num_secondaries - 1, @conn.secondary_pools.length
+
+    @rs.restart_killed_nodes
+  end
 
   def test_automated_refresh_with_removed_node
-    @conn = ReplSetConnection.new([self.rs.host, self.rs.ports[0]],
-                                  [self.rs.host, self.rs.ports[1]],
-                                  [self.rs.host, self.rs.ports[2]],
-                                  :refresh_interval => 2,
-                                  :refresh_mode => :sync)
+    @conn = ReplSetConnection.new(build_seeds(3),
+      :refresh_interval => 2, :refresh_mode => :sync)
 
     num_secondaries = @conn.secondary_pools.length
     old_refresh_version = @conn.refresh_version
 
-    n = self.rs.remove_secondary_node
+    n = @rs.remove_secondary_node
     sleep(4)
     @conn['foo']['bar'].find_one
 
@@ -118,23 +123,19 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
     assert_equal num_secondaries - 1, @conn.secondaries.length
     assert_equal num_secondaries - 1, @conn.secondary_pools.length
 
-    self.rs.add_node(n)
+    @rs.add_node(n)
   end
 
   def test_adding_and_removing_nodes
-    @conn = ReplSetConnection.new([self.rs.host, self.rs.ports[0]],
-                                  [self.rs.host, self.rs.ports[1]],
-                                  [self.rs.host, self.rs.ports[2]],
-                                  :refresh_interval => 2, :refresh_mode => :sync)
+    @conn = ReplSetConnection.new(build_seeds(3),
+      :refresh_interval => 2, :refresh_mode => :sync)
 
-    self.rs.add_node
+    @rs.add_node
     sleep(4)
     @conn['foo']['bar'].find_one
 
-    @conn2 = ReplSetConnection.new([self.rs.host, self.rs.ports[0]],
-                                   [self.rs.host, self.rs.ports[1]],
-                                   [self.rs.host, self.rs.ports[2]],
-                                   :refresh_interval => 2, :refresh_mode => :sync)
+    @conn2 = ReplSetConnection.new(build_seeds(3),
+      :refresh_interval => 2, :refresh_mode => :sync)
 
     assert @conn2.secondaries.sort == @conn.secondaries.sort,
       "Second connection secondaries not equal to first."
@@ -143,7 +144,7 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
 
     config = @conn['admin'].command({:ismaster => 1})
 
-    self.rs.remove_secondary_node
+    @rs.remove_secondary_node
     sleep(4)
     config = @conn['admin'].command({:ismaster => 1})
 

data/test/replica_sets/refresh_with_threads_test.rb

@@ -3,24 +3,25 @@ require './test/replica_sets/rs_test_helper'
 require 'benchmark'
 
 class ReplicaSetRefreshWithThreadsTest < Test::Unit::TestCase
-  include ReplicaSetTest
 
   def setup
+    ensure_rs
     @conn = nil
   end
 
   def teardown
-    self.rs.restart_killed_nodes
+    @rs.restart_killed_nodes
     @conn.close if @conn
   end
 
   def test_read_write_load_with_added_nodes
-    @conn = ReplSetConnection.new([self.rs.host, self.rs.ports[0]],
-                                  [self.rs.host, self.rs.ports[1]],
-                                  [self.rs.host, self.rs.ports[2]],
-                                  :refresh_interval => 5,
-                                  :refresh_mode => :sync,
-                                  :read => :secondary)
+    seeds = build_seeds(3)
+    args = {
+      :refresh_interval => 5,
+      :refresh_mode => :sync,
+      :read => :secondary
+    }
+    @conn = ReplSetConnection.new(seeds, args)
     @duplicate = @conn[MONGO_TEST_DB]['duplicate']
     @unique    = @conn[MONGO_TEST_DB]['unique']
     @duplicate.insert("test" => "insert")
@@ -44,7 +45,7 @@ class ReplicaSetRefreshWithThreadsTest < Test::Unit::TestCase
       end
     end
 
-    self.rs.add_node
+    @rs.add_node
     threads.each {|t| t.join }
 
     config = @conn['admin'].command({:ismaster => 1})

data/test/replica_sets/replication_ack_test.rb

@@ -2,10 +2,10 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require './test/replica_sets/rs_test_helper'
 
 class ReplicaSetAckTest < Test::Unit::TestCase
-  include ReplicaSetTest
 
   def setup
-    @conn = ReplSetConnection.new([self.rs.host, self.rs.ports[0]])
+    ensure_rs
+    @conn = ReplSetConnection.new(build_seeds(1))
 
     @slave1 = Connection.new(@conn.secondary_pools[0].host,
       @conn.secondary_pools[0].port, :slave_ok => true)
@@ -18,7 +18,7 @@ class ReplicaSetAckTest < Test::Unit::TestCase
   end
 
   def teardown
-    self.rs.restart_killed_nodes
+    @rs.restart_killed_nodes
     @conn.close if @conn
   end
 

data/test/replica_sets/rs_test_helper.rb

@@ -2,18 +2,16 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require './test/test_helper'
 require './test/tools/repl_set_manager'
 
-module ReplicaSetTest
-
-  def self.rs
-    unless defined?(@rs)
-      @rs = ReplSetManager.new
-      @rs.start_set
+class Test::Unit::TestCase
+  # Ensure replica set is available as an instance variable and that
+  # a new set is spun up for each TestCase class
+  def ensure_rs
+    unless defined?(@@current_class) and @@current_class == self.class
+      @@current_class = self.class 
+      @@rs = ReplSetManager.new
+      @@rs.start_set
     end
-    @rs
-  end
-
-  def rs
-    ReplicaSetTest.rs
+    @rs = @@rs
   end
 
   # Generic code for rescuing connection failures and retrying operations.
@@ -30,4 +28,12 @@ module ReplicaSetTest
       retry
     end
   end
+  
+  def build_seeds(num_hosts)
+    seeds = []
+    num_hosts.times do |n|
+      seeds << "#{@rs.host}:#{@rs.ports[n]}"
+    end
+    seeds
+  end
 end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems' if RUBY_VERSION < '1.9.0' && ENV['C_EXT']
+require 'rubygems' if RUBY_VERSION
 require 'mongo'
+gem 'test-unit'
 require 'test/unit'
 
 def silently

data/test/tools/repl_set_manager.rb

@@ -13,6 +13,7 @@ class ReplSetManager
   attr_accessor :host, :start_port, :ports, :name, :mongods, :tags, :version
 
   def initialize(opts={})
+    @mongod     = ENV['mongod'] || 'mongod'
     @start_port = opts[:start_port] || 30000
     @ports      = []
     @name       = opts[:name] || 'replica-set-foo'
@@ -21,6 +22,7 @@ class ReplSetManager
     @config     = {"_id" => @name, "members" => []}
     @durable    = opts.fetch(:durable, false)
     @smallfiles = opts.fetch(:smallfiles, true)
+    @prealloc   = opts.fetch(:prealloc, false)
     @path       = File.join(File.expand_path(File.dirname(__FILE__)), "data")
     @oplog_size = opts.fetch(:oplog_size, 16)
     @tags = [{"dc" => "ny", "rack" => "a", "db" => "main"},
@@ -38,7 +40,7 @@ class ReplSetManager
     end
 
     @mongods   = {}
-    version_string = `mongod --version`
+    version_string = `#{@mongod} --version`
     version_string =~ /(\d\.\d\.\d)/
     @version = $1.split(".").map {|d| d.to_i }
   end
@@ -124,10 +126,11 @@ class ReplSetManager
   end
 
   def start_cmd(n)
-    @mongods[n]['start'] = "mongod --replSet #{@name} --logpath '#{@mongods[n]['log_path']}' " +
+    @mongods[n]['start'] = "#{@mongod} --replSet #{@name} --logpath '#{@mongods[n]['log_path']}' " +
      "--oplogSize #{@oplog_size} #{journal_switch} --dbpath #{@mongods[n]['db_path']} --port #{@mongods[n]['port']} --fork"
     @mongods[n]['start'] += " --dur" if @durable
     @mongods[n]['start'] += " --smallfiles" if @smallfiles
+    @mongods[n]['start'] += " --noprealloc" unless @prealloc
     @mongods[n]['start']
   end
 
@@ -152,11 +155,11 @@ class ReplSetManager
     return secondary
   end
 
-  def add_node(n=nil)
+  def add_node(n=nil, &block)
     primary = get_node_with_state(1)
     con = get_connection(primary)
 
-    init_node(n || @mongods.length)
+    init_node(n || @mongods.length, &block)
     config = con['local']['system.replset'].find_one
     @config['version'] = config['version'] + 1
 
@@ -169,12 +172,33 @@ class ReplSetManager
     con.close
     ensure_up
   end
+  
+  def add_arbiter
+    add_node do |attrs|
+      attrs['arbiterOnly'] = true
+    end
+  end
+  
+  def wait_for_death(pid)
+    @retries.times do
+      if `ps a | grep mongod`.include?("#{pid}")
+        puts "waiting for mongod @ pid #{pid} to die..."
+        sleep(1)
+      else
+        puts "mongod @ pid #{pid} was killed successfully"
+        return true
+      end
+    end
+    puts "mongod never died"
+    return false
+  end
 
   def kill(node, signal=2)
     pid = @mongods[node]['pid']
     puts "** Killing node with pid #{pid} at port #{@mongods[node]['port']}"
     system("kill #{pid}")
-    @mongods[node]['up'] = false
+    dead = wait_for_death(pid)
+    @mongods[node]['up'] = false if dead
   end
 
   def kill_primary(signal=2)
@@ -248,40 +272,40 @@ class ReplSetManager
         raise ex
       end
       if status['members'].all? { |m| m['health'] == 1 &&
-       [1, 2, 7].include?(m['state']) } &&
-       status['members'].any? { |m| m['state'] == 1 }
-
-       connections = []
-       states      = []
-       status['members'].each do |member|
-         begin
-           host, port = member['name'].split(':')
-           port = port.to_i
-           conn = Mongo::Connection.new(host, port, :slave_ok => true)
-           connections << conn
-           state = conn['admin'].command({:ismaster => 1})
-           states << state
-         rescue Mongo::ConnectionFailure
-           connections.each {|c| c.close }
-           con.close
-           raise Mongo::OperationFailure
-         end
-       end
-
-       if states.any? {|s| s['ismaster']}
-         print "all members up!\n\n"
-         connections.each {|c| c.close }
-         con.close
-         return status
-       else
-         con.close
-         raise Mongo::OperationFailure
-       end
-     else
-       con.close
-       raise Mongo::OperationFailure
-     end
-     end
+        [1, 2, 7].include?(m['state']) } &&
+        status['members'].any? { |m| m['state'] == 1 }
+
+        connections = []
+        states      = []
+        status['members'].each do |member|
+        begin
+          host, port = member['name'].split(':')
+          port = port.to_i
+          conn = Mongo::Connection.new(host, port, :slave_ok => true)
+          connections << conn
+          state = conn['admin'].command({:ismaster => 1})
+          states << state
+        rescue Mongo::ConnectionFailure
+          connections.each {|c| c.close }
+          con.close
+          raise Mongo::OperationFailure
+        end
+      end
+
+      if states.any? {|s| s['ismaster']}
+        print "all members up!\n\n"
+        connections.each {|c| c.close }
+        con.close
+        return status
+      else
+        con.close
+        raise Mongo::OperationFailure
+      end
+      else
+        con.close
+        raise Mongo::OperationFailure
+      end
+    end
     return false
   end
 

data/test/unit/collection_test.rb

@@ -5,7 +5,8 @@ class CollectionTest < Test::Unit::TestCase
   context "Basic operations: " do
     setup do
       @logger = mock()
-      @logger.expects(:warn)
+      @logger.stubs(:level => 0)
+      @logger.expects(:debug)
     end
 
     should "send update message" do