huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Re-order execution in CacheTagHelper to avoid setting the result too early 

Re-enable skipped tests
Fixes #7042
This commit is contained in:
Pranav K 2017-11-20 09:08:55 -08:00
parent b26f64e554
commit 9dc9381ae4
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs
View File

@ -108,8 +108,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// The returned value is ignored, we only do this so that // The returned value is ignored, we only do this so that
// the compiler doesn't complain about the returned task // the compiler doesn't complain about the returned task
// not being awaited // not being awaited
var localTcs = MemoryCache.Set(cacheKey, tcs.Task, options); _ = MemoryCache.Set(cacheKey, tcs.Task, options);
IHtmlContent content;
try try
{ {
// The entry is set instead of assigning a value to the // The entry is set instead of assigning a value to the
@ -118,24 +119,26 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// Use the CreateEntry to ensure a cache scope is created that will copy expiration tokens from // Use the CreateEntry to ensure a cache scope is created that will copy expiration tokens from
// cache entries created from the GetChildContentAsync call to the current entry. // cache entries created from the GetChildContentAsync call to the current entry.
IHtmlContent content;
var entry = MemoryCache.CreateEntry(cacheKey); var entry = MemoryCache.CreateEntry(cacheKey);
// The result is processed inside an entry // The result is processed inside an entry
// such that the tokens are inherited. // such that the tokens are inherited.
var result = ProcessContentAsync(output); var result = ProcessContentAsync(output);
content = await result; content = await result;
options.SetSize(GetSize(content)); options.SetSize(GetSize(content));
entry.SetOptions(options); entry.SetOptions(options);
entry.Value = result; entry.Value = result;
tcs.SetResult(content);
// An entry gets committed to the cache when disposed gets called. We only want to do this when // An entry gets committed to the cache when disposed gets called. We only want to do this when
// the content has been correctly generated (didn't throw an exception). For that reason the entry // the content has been correctly generated (didn't throw an exception). For that reason the entry
// can't be put inside a using block. // can't be put inside a using block.
entry.Dispose(); entry.Dispose();
// Set the result on the TCS once we've commited the entry to the cache since commiting to the cache
// may throw.
tcs.SetResult(content);
return content; return content;
} }
catch (Exception ex) catch (Exception ex)
@ -144,7 +147,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
tokenSource.Cancel(); tokenSource.Cancel();
// Fail the TCS so other awaiters see the exception. // Fail the TCS so other awaiters see the exception.
tcs.SetException(ex); tcs.TrySetException(ex);
throw; throw;
} }
finally finally

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs
View File

@ -255,7 +255,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
#endif #endif
} }
[Fact(Skip = "https://github.com/aspnet/Mvc/issues/7042")] [Fact]
public async Task CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents() public async Task CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents()
{ {
// Arrange // Arrange
@ -440,7 +440,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.Equal(expected2, response4.Trim()); Assert.Equal(expected2, response4.Trim());
} }
[Fact(Skip = "https://github.com/aspnet/Mvc/issues/7042")] [Fact]
public async Task CacheTagHelper_BubblesExpirationOfNestedTagHelpers() public async Task CacheTagHelper_BubblesExpirationOfNestedTagHelpers()
{ {
// Arrange & Act - 1 // Arrange & Act - 1

2
test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
View File

@ -801,7 +801,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
Assert.Equal(childContent, tagHelperOutput4.Content.GetContent()); Assert.Equal(childContent, tagHelperOutput4.Content.GetContent());
} }
[Fact(Skip = "https://github.com/aspnet/Mvc/issues/7042")] [Fact]
public async Task ProcessAsync_WorksForNestedCacheTagHelpers() public async Task ProcessAsync_WorksForNestedCacheTagHelpers()
{ {
// Arrange // Arrange