Skip to content

Prevent cache from being resized #59607

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

Merged
eerhardt merged 1 commit into from
Sep 28, 2021
Merged

Prevent cache from being resized #59607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 14 additions & 18 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 @@ -137,9 +137,19 @@ internal void SetEntry(CacheEntry entry)
priorEntry.SetExpired(EvictionReason.Replaced);
}

bool exceedsCapacity = UpdateCacheSizeExceedsCapacity(entry);
if (entry.CheckExpired(utcNow))
{
entry.InvokeEvictionCallbacks();
if (priorEntry != null)
{
RemoveEntry(priorEntry);
}
StartScanForExpiredItemsIfNeeded(utcNow);
return;
}

if (!entry.CheckExpired(utcNow) && !exceedsCapacity)
bool exceedsCapacity = UpdateCacheSizeExceedsCapacity(entry);
if (!exceedsCapacity)
{
bool entryAdded = false;

Expand Down Expand Up @@ -192,22 +202,8 @@ internal void SetEntry(CacheEntry entry)
}
else
{
if (exceedsCapacity)
{
// The entry was not added due to overcapacity
entry.SetExpired(EvictionReason.Capacity);

TriggerOvercapacityCompaction();
}
else
{
if (_options.SizeLimit.HasValue)
{
// Entry could not be added due to being expired, reset cache size
Interlocked.Add(ref _cacheSize, -entry.Size.Value);
}
}

entry.SetExpired(EvictionReason.Capacity);
TriggerOvercapacityCompaction();
entry.InvokeEvictionCallbacks();
if (priorEntry != null)
{
Expand Down