Skip to content

2nd call to MemoryCache.Set() with the same key same size erases entry if cache is full #102420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pedrobsaila wants to merge 2 commits into from
Closed

2nd call to MemoryCache.Set() with the same key same size erases entry if cache is full #102420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b650a5
2nd call to MemoryCache.Set() with the same key same size erases entr…
pedrobsaila May 19, 2024
3a9d047
handle the case when new entry has less size than older one
pedrobsaila May 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,29 @@ internal void SetEntry(CacheEntry entry)

priorEntry?.InvokeEvictionCallbacks();
}
else if (_options.HasSizeLimit && priorEntry != null && priorEntry.Size >= entry.Size)

@ericstj ericstj Jun 24, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to avoid a separate case here by passing priorEntry to UpdateCacheSizeExceedsCapacity? @Tratcher mentioned in the issue that he thought the cause here was that that method didn't consider the size of the evicted item.

@jozkee jozkee Jun 24, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, for this case we should run the same logic we run for not exceeding capacity.

@jozkee jozkee Jun 24, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#103931

{
bool entryAdded = coherentState._entries.TryUpdate(entry.Key, entry, priorEntry);

if (entryAdded)
{
long newSizeIncrement = entry.Size - priorEntry.Size;

if (newSizeIncrement < 0)
{
Interlocked.Add(ref coherentState._cacheSize, newSizeIncrement);
}

entry.AttachTokens();
}
else
{
entry.SetExpired(EvictionReason.Replaced);
entry.InvokeEvictionCallbacks();
}

priorEntry.InvokeEvictionCallbacks();
}
else
{
entry.SetExpired(EvictionReason.Capacity);
Expand Down
25 changes: 25 additions & 0 deletions src/libraries/Microsoft.Extensions.Caching.Memory/tests/CapacityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,31 @@ public void AddingReplacementExceedsCapacityRemovesOldEntry()
AssertCacheSize(0, cache); // addition was rejected due to size, and previous item with the same key removed
}

[Theory]
[InlineData(6)]
[InlineData(5)]
[InlineData(2)]
public void ReplaceOldEntryWithSameSizeOrLessNewEntryAtSizeLimitCapacity(int newValueSize)
{
var cache = new MemoryCache(new MemoryCacheOptions
{
SizeLimit = 6
});

AssertCacheSize(0, cache);

cache.Set("key", "oldValue", new MemoryCacheEntryOptions { Size = 6 });

Assert.Equal("oldValue", cache.Get("key"));

AssertCacheSize(6, cache);

cache.Set("key", "newValue", new MemoryCacheEntryOptions { Size = newValueSize });

Assert.Equal("newValue", cache.Get("key"));
AssertCacheSize(newValueSize, cache);
}

[Fact]
public void RemovingEntryDecreasesCacheSize()
{
Expand Down