Skip to content
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

Jump to bottom

Fix PostEvictionCallbacks bug #46807

Merged
merged 4 commits into from
Jan 11, 2021
Merged

Fix PostEvictionCallbacks bug #46807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c62f5b9
add a failing test
adamsitnik Jan 11, 2021
2e8cdcf
fix the actual bug (this was not a CacheEntry but a CacheEntryTokens …
adamsitnik Jan 11, 2021
32f43c5
address code review feedback
adamsitnik Jan 11, 2021
76d319c
address code review feedback:
adamsitnik Jan 11, 2021
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
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.CacheEntryTokens.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ private sealed class CacheEntryTokens
internal List<IChangeToken> ExpirationTokens => _expirationTokens ??= new List<IChangeToken>();
internal List<PostEvictionCallbackRegistration> PostEvictionCallbacks => _postEvictionCallbacks ??= new List<PostEvictionCallbackRegistration>();

internal void AttachTokens()
internal void AttachTokens(CacheEntry cacheEntry)
{
if (_expirationTokens != null)
{
Expand All @@ -35,7 +35,7 @@ internal void AttachTokens()
if (expirationToken.ActiveChangeCallbacks)
{
_expirationTokenRegistrations ??= new List<IDisposable>(1);
IDisposable registration = expirationToken.RegisterChangeCallback(ExpirationCallback, this);
IDisposable registration = expirationToken.RegisterChangeCallback(ExpirationCallback, cacheEntry);
_expirationTokenRegistrations.Add(registration);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.Extensions.Caching.Memory/src/CacheEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ bool FullCheck(in DateTimeOffset offset)
}
}

internal void AttachTokens() => _tokens?.AttachTokens();
internal void AttachTokens() => _tokens?.AttachTokens(this);

private static void ExpirationTokensExpired(object obj)
{
Expand Down
29 changes: 29 additions & 0 deletions src/libraries/Microsoft.Extensions.Caching.Memory/tests/TokenExpirationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,35 @@ public void TokenExpiresOnRegister()
Assert.Null(result);
}

[Fact]
public void PostEvictionCallbacksGetInvokedWhenMemoryCacheEntriesExpireWithAnActiveChangeToken()
{
using var cache = new MemoryCache(new MemoryCacheOptions());
var key = new object();

var cts = new CancellationTokenSource();
var callbackInvoked = new ManualResetEvent(false);

cache.Set(key, new object(), new MemoryCacheEntryOptions
{
ExpirationTokens = { new CancellationChangeToken(cts.Token) },
PostEvictionCallbacks =
{
new PostEvictionCallbackRegistration()
{
EvictionCallback = (key, value, reason, state) => ((ManualResetEvent)state).Set(),
State = callbackInvoked
}
}
});

Assert.True(cache.TryGetValue(key, out _));

cts.Cancel();
Assert.True(callbackInvoked.WaitOne(TimeSpan.FromSeconds(10)));
Assert.False(cache.TryGetValue(key, out _));
}

internal class TestToken : IChangeToken
{
private bool _hasChanged;
Expand Down