Merge branch 'master' into actually-test-rails

johnnyshields · web-flow · commit 451d828037ce · 2025-06-20T17:53:35.000+09:00
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -39,7 +39,7 @@ functions:
           git submodule update --init --recursive
 
   "create expansions":
-    # Make an evergreen expansion file with dynamic values
+    # Make an evergreen exapansion file with dynamic values
     - command: shell.exec
       params:
         working_dir: "src"
@@ -427,6 +427,10 @@ axes:
         display_name: Sharded Cluster
         variables:
            TOPOLOGY: "sharded-cluster"
+      - id: "load-balanced"
+        display_name: Load Balanced
+        variables:
+           TOPOLOGY: "load-balanced"
 
   - id: "auth"
     display_name: Authentication
@@ -639,22 +643,22 @@ buildvariants:
   tasks:
     - name: "test"
 
-- matrix_name: "ruby-3.3"
+- matrix_name: "ruby-3.2 + db-7.0"
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['7.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
 
-- matrix_name: "ruby-3.2"
+- matrix_name: "ruby-3.2 + db-6.0"
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -665,7 +669,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.1"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -698,7 +702,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-2.7"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['4.4']
     os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
diff --git a/.evergreen/config/axes.yml.erb b/.evergreen/config/axes.yml.erb
@@ -54,6 +54,10 @@ axes:
         display_name: Sharded Cluster
         variables:
            TOPOLOGY: "sharded-cluster"
+      - id: "load-balanced"
+        display_name: Load Balanced
+        variables:
+           TOPOLOGY: "load-balanced"
 
   - id: "auth"
     display_name: Authentication
diff --git a/.evergreen/config/commands.yml.erb b/.evergreen/config/commands.yml.erb
@@ -13,7 +13,7 @@ functions:
           git submodule update --init --recursive
 
   "create expansions":
-    # Make an evergreen exapanstion file with dynamic values
+    # Make an evergreen exapansion file with dynamic values
     - command: shell.exec
       params:
         working_dir: "src"
diff --git a/.evergreen/config/variants.yml.erb b/.evergreen/config/variants.yml.erb
@@ -10,22 +10,22 @@ buildvariants:
   tasks:
     - name: "test"
 
-- matrix_name: "ruby-3.3"
+- matrix_name: "ruby-3.2 + db-7.0"
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['7.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
 
-- matrix_name: "ruby-3.2"
+- matrix_name: "ruby-3.2 + db-6.0"
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -36,7 +36,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.1"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -69,7 +69,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-2.7"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['4.4']
     os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -8,9 +8,11 @@ set -o errexit  # Exit the script with error if any of the commands fail
 #       RVM_RUBY                Define the Ruby version to test with, using its RVM identifier.
 #                               For example: "ruby-3.0" or "jruby-9.2"
 
-. `dirname "$0"`/../spec/shared/shlib/distro.sh
-. `dirname "$0"`/../spec/shared/shlib/set_env.sh
-. `dirname "$0"`/../spec/shared/shlib/server.sh
+MRSS_ROOT=`dirname "$0"`/../spec/shared
+
+. $MRSS_ROOT/shlib/distro.sh
+. $MRSS_ROOT/shlib/set_env.sh
+. $MRSS_ROOT/shlib/server.sh
 . `dirname "$0"`/functions.sh
 
 arch=`host_distro`
@@ -28,6 +30,10 @@ prepare_server $arch
 
 install_mlaunch_venv
 
+if test "$TOPOLOGY" = load-balanced; then
+  install_haproxy
+fi
+
 # Launching mongod under $MONGO_ORCHESTRATION_HOME
 # makes its log available through log collecting machinery
 
diff --git a/Gemfile b/Gemfile
@@ -17,3 +17,6 @@ if RUBY_PLATFORM =~ /java/
 end
 
 gem 'i18n', *i18n_versions
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: %i[ windows jruby ]
diff --git a/lib/mongoid/association/embedded/embeds_one/proxy.rb b/lib/mongoid/association/embedded/embeds_one/proxy.rb
@@ -36,8 +36,8 @@ def initialize(base, target, association)
               bind_one
               characterize_one(_target)
               update_attributes_hash(_target)
-              _base._reset_memoized_descendants!
               _target.save if persistable?
+              _base._reset_memoized_descendants!
             end
           end
 
diff --git a/lib/mongoid/tasks/database.rb b/lib/mongoid/tasks/database.rb
@@ -178,7 +178,7 @@ def shard_collections(models = ::Mongoid.models)
             next
           end
 
-          unless model.collection.cluster.sharded?
+          unless model.collection.cluster.sharded? || model.collection.cluster.load_balanced?
             logger.warn("MONGOID: #{model} has shard config but is not persisted in a sharded cluster: #{model.collection.cluster.summary}")
             next
           end
diff --git a/mongoid.gemspec b/mongoid.gemspec
@@ -25,13 +25,6 @@ Gem::Specification.new do |s|
     'source_code_uri' => 'https://github.com/mongodb/mongoid',
   }
 
-  if File.exist?('gem-private_key.pem')
-    s.signing_key = 'gem-private_key.pem'
-    s.cert_chain = ['gem-public_cert.pem']
-  else
-    warn "[#{s.name}] Warning: No private key present, creating unsigned gem."
-  end
-
   s.required_ruby_version     = ">= 2.7"
   s.required_rubygems_version = ">= 1.3.6"
 
diff --git a/spec/integration/associations/embeds_one_spec.rb b/spec/integration/associations/embeds_one_spec.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 
 describe 'embeds_one associations' do
-
-  context 're-associating the same object' do
+  context 'when re-associating the same object' do
     context 'with dependent: destroy' do
       let(:canvas) do
         Canvas.create!(palette: Palette.new)
@@ -17,7 +15,7 @@
         canvas.palette = canvas.palette
         canvas.save!
         canvas.reload
-        canvas.palette.should == palette
+        expect(canvas.palette).to eq palette
       end
     end
   end
@@ -31,12 +29,33 @@
     end
 
     it 'loads the association correctly' do
-      expect { klass }.to_not raise_error
-      expect { klass.new.address }.to_not raise_error
+      expect { klass }.not_to raise_error
+      expect { klass.new.address }.not_to raise_error
       instance = klass.new
       address = Address.new
       instance.address = address
       expect(instance.address).to eq address
     end
   end
+
+  context 'when parent is persisted' do
+    let!(:person) do
+      Person.create!
+    end
+
+    context 'when assigning the new child' do
+      context 'when assigning an attribute to the child' do
+        before do
+          # person.reload
+          person.name = Name.new
+          person.name.first_name = 'Dmitry'
+          person.save!
+        end
+
+        it 'persists the child' do
+          expect(person.reload.name.first_name).to eq 'Dmitry'
+        end
+      end
+    end
+  end
 end
diff --git a/spec/mongoid/association/referenced/has_and_belongs_to_many/proxy_spec.rb b/spec/mongoid/association/referenced/has_and_belongs_to_many/proxy_spec.rb
@@ -1899,16 +1899,30 @@
     context "when appending to a relation in a transaction" do
       require_transaction_support
 
+      # for some reason this test fails intermittently on any sharded
+      # topology (sharded or load-balanced). The error is:
+      #
+      #   [13388:StaleConfig]: Transaction <id>...eats is not currently
+      #   known and needs to be recovered
+      #
+      # It will fail on one run, succeed on the next, fail on the next,
+      # etc. Tested on both db versions 7 and 8, with both sharded and
+      # load-balanced topologies. For now, we'll just test this on a
+      # replica set.
+      require_topology :replica_set
+
+      # this also fails on server version 4.0, even with replica set,
+      # so we'll just skip it
+      min_server_version '5.0'
+
       let!(:sandwich) do
         Sandwich.create!
       end
 
       it "returns true" do
-        sandwich.with_session do |session|
-          session.with_transaction do
-            expect{ sandwich.meats << Meat.new }.to_not raise_error
-            expect(sandwich.meats.any?).to be true
-          end
+        sandwich.transaction do
+          expect{ sandwich.meats << Meat.new }.to_not raise_error
+          expect(sandwich.meats.any?).to be true
         end
       end
     end
diff --git a/spec/mongoid/association/referenced/has_many/proxy_spec.rb b/spec/mongoid/association/referenced/has_many/proxy_spec.rb
@@ -1323,6 +1323,22 @@ def fresh_movie_ratings?
     context 'when appending to an association in a transaction' do
       require_transaction_support
 
+      # for some reason this test fails intermittently on any sharded
+      # topology (sharded or load-balanced). The error is:
+      #
+      #   [13388:StaleConfig]: Transaction <id>...eats is not currently
+      #   known and needs to be recovered
+      #
+      # It will fail on one run, succeed on the next, fail on the next,
+      # etc. Tested on both db versions 7 and 8, with both sharded and
+      # load-balanced topologies. For now, we'll just test this on a
+      # replica set.
+      require_topology :replica_set
+
+      # this also fails on server version 4.0, even with replica set,
+      # so we'll just skip it
+      min_server_version '5.0'
+
       let!(:movie) { Movie.create! }
 
       def with_transaction_via(model, &block)
diff --git a/spec/mongoid/tasks/database_spec.rb b/spec/mongoid/tasks/database_spec.rb
@@ -352,4 +352,21 @@ class Band
       expect(indexes.select{ |doc| doc["name"] == "_id_" }).to_not be_empty
     end
   end
+
+  describe '.shard_collections' do
+    context 'when the cluster is load-balanced' do
+      require_topology :load_balanced
+
+      let(:model) { Profile }
+
+      before do
+        expect(logger).not_to receive(:warn)
+      end
+
+      it "permits load-balanced clusters to act as sharded" do
+        result = described_class.shard_collections([ model ])
+        expect(result).to include(model)
+      end
+    end
+  end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -81,7 +81,7 @@ def database_id_alt
         heartbeat_frequency: 180,
         user: SpecConfig.instance.uri.client_options[:user] || MONGOID_ROOT_USER.name,
         password: SpecConfig.instance.uri.client_options[:password] || MONGOID_ROOT_USER.password,
-        auth_source: Mongo::Database::ADMIN
+        auth_source: Mongo::Database::ADMIN,
       )
     }
   },
@@ -95,6 +95,13 @@ def database_id_alt
   }
 }
 
+if SpecConfig.instance.uri.uri_options[:load_balanced]
+  # If the URI specifies load balancing, we need to set the load_balanced option
+  # in the client configuration.
+  CONFIG[:clients][:default][:options][:load_balanced] = true
+  CONFIG[:clients][:default][:options][:connect] = :load_balanced
+end
+
 # Set the database that the spec suite connects to.
 Mongoid.configure do |config|
   config.load_configuration(CONFIG)
@@ -126,9 +133,12 @@ class Query
 end
 
 unless SpecConfig.instance.atlas?
+  uri_options = SpecConfig.instance.uri.uri_options.merge(server_selection_timeout: 3.03)
+  uri_options[:connect] = :load_balanced if uri_options[:load_balanced]
+
   # The user must be created before any of the tests are loaded, until
   # https://jira.mongodb.org/browse/MONGOID-4827 is implemented.
-  client = Mongo::Client.new(SpecConfig.instance.addresses, server_selection_timeout: 3.03)
+  client = Mongo::Client.new(SpecConfig.instance.addresses, uri_options)
   begin
     # Create the root user administrator as the first user to be added to the
     # database. This user will need to be authenticated in order to add any
@@ -155,13 +165,11 @@ class Query
   # Drop all collections and clear the identity map before each spec.
   config.before(:each) do
     cluster = Mongoid.default_client.cluster
-    # Older drivers do not have a #connected? method
-    if cluster.respond_to?(:connected?) && !cluster.connected?
+    if cluster.load_balanced? || !cluster.connected?
       Mongoid.default_client.reconnect
     end
-    Mongoid.default_client.collections.each do |coll|
-      coll.delete_many
-    end
+
+    Mongoid.default_client.collections.each(&:drop)
   end
 end
 
diff --git a/spec/support/spec_config.rb b/spec/support/spec_config.rb
@@ -82,4 +82,9 @@ def installed_rails_version
       versions.detect { |v| v =~ rails_version_re }
     end
   end
+
+  # Returns whether the test suite was configured with a single mongos.
+  def single_mongos?
+    %w(1 true yes).include?(ENV['SINGLE_MONGOS'])
+  end
 end
