Pass options to write_entry in handle_expired_entry method

activesupport/lib/active_support/cache.rb

@@ -1030,7 +1030,8 @@ def handle_expired_entry(entry, key, options)
               # When an entry has a positive :race_condition_ttl defined, put the stale entry back into the cache
               # for a brief period while the entry is being recalculated.
               entry.expires_at = Time.now.to_f + race_ttl
-              write_entry(key, entry, expires_in: race_ttl * 2)
+              options[:expires_in] = race_ttl * 2
+              write_entry(key, entry, **options)
             else
               delete_entry(key, **options)
             end

activesupport/test/cache/behaviors/cache_store_coder_behavior.rb

@@ -2,11 +2,12 @@
 
 module CacheStoreCoderBehavior
   class SpyCoder
-    attr_reader :dumped_entries, :loaded_entries
+    attr_reader :dumped_entries, :loaded_entries, :dump_compressed_entries
 
     def initialize
       @dumped_entries = []
       @loaded_entries = []
+      @dump_compressed_entries = []
     end
 
     def dump(entry)
@@ -19,6 +20,15 @@ def load(payload)
       @loaded_entries << entry
       entry
     end
+
+    def dump_compressed(entry, threshold)
+      if threshold == 0
+        @dump_compressed_entries << entry
+        Marshal.dump(entry)
+      else
+        dump(entry)
+      end
+    end
   end
 
   def test_coder_receive_the_entry_on_write
@@ -83,4 +93,28 @@ def test_nil_coder_bypasses_serialization
     entry = ActiveSupport::Cache::Entry.new("value")
     assert_same entry, @store.send(:serialize_entry, entry)
   end
+
+  def test_coder_is_used_during_handle_expired_entry_when_expired
+    coder = SpyCoder.new
+    @store = lookup_store(coder: coder)
+    @store.write("foo", "bar", expires_in: 1.second)
+    assert_equal 0, coder.loaded_entries.size
+    assert_equal 1, coder.dumped_entries.size
+
+    travel_to(2.seconds.from_now) do
+      val = @store.fetch(
+          "foo",
+          race_condition_ttl: 5,
+          compress: true,
+          compress_threshold: 0
+        ) { "baz" }
+      assert_equal "baz", val
+      assert_equal 1, coder.loaded_entries.size # 1 read in fetch
+      assert_equal "bar", coder.loaded_entries.first.value
+      assert_equal 1, coder.dumped_entries.size # did not change from original write
+      assert_equal 2, coder.dump_compressed_entries.size # 1 write the expired entry handler, 1 in fetch
+      assert_equal "bar", coder.dump_compressed_entries.first.value
+      assert_equal "baz", coder.dump_compressed_entries.last.value
+    end
+  end
 end