yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7848 from umbraco/v7/bugfix/7773-memory-leak

Browse Source 
Fixes Memory Leak in GetCacheItem cache dependency #7773
This commit is contained in:
Claus
2020-03-26 23:45:38 +01:00
committed by GitHub
parent e8d63d9a7a e748d842a4
commit 547099c900
3 changed files with 22 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
View File

@@ -72,21 +72,16 @@ namespace Umbraco.Core.Cache
/// <returns></returns>
public override object GetCacheItem(string cacheKey, Func<object> getCacheItem)
{
return GetCacheItem(cacheKey, getCacheItem, null, dependentFiles: null);
return GetCacheItemInternal(cacheKey, getCacheItem, null);
}
/// <summary>
/// This overload is here for legacy purposes
/// </summary>
/// <param name="cacheKey"></param>
/// <param name="getCacheItem"></param>
/// <param name="timeout"></param>
/// <param name="isSliding"></param>
/// <param name="priority"></param>
/// <param name="removedCallback"></param>
/// <param name="dependency"></param>
/// <returns></returns>
[Obsolete("This is here for legacy reasons only, do not use this method, it has memory leaks")]
internal object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
{
return GetCacheItemInternal(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, () => dependency);
}
private object GetCacheItemInternal(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, Func<CacheDependency> dependency = null)
{
cacheKey = GetCacheKey(cacheKey);
@@ -141,7 +136,7 @@ namespace Umbraco.Core.Cache
lck.UpgradeToWriteLock();
//NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
_cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
_cache.Insert(cacheKey, result, dependency?.Invoke(), absolute, sliding, priority, removedCallback);
}
}
@@ -160,29 +155,22 @@ namespace Umbraco.Core.Cache
public object GetCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
{
CacheDependency dependency = null;
if (dependentFiles != null && dependentFiles.Any())
{
dependency = new CacheDependency(dependentFiles);
}
return GetCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
return GetCacheItemInternal(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback,
// Don't create a CacheDependency object unless we need it, see https://github.com/umbraco/Umbraco-CMS/issues/7773
() => dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null);
}
#endregion
#region Insert
/// <summary>
/// This overload is here for legacy purposes
/// </summary>
/// <param name="cacheKey"></param>
/// <param name="getCacheItem"></param>
/// <param name="timeout"></param>
/// <param name="isSliding"></param>
/// <param name="priority"></param>
/// <param name="removedCallback"></param>
/// <param name="dependency"></param>
[Obsolete("This is here for legacy reasons only, do not use this method, it has memory leaks")]
internal void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, CacheDependency dependency = null)
{
InsertCacheItemInternal(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, () => dependency);
}
private void InsertCacheItemInternal(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, Func<CacheDependency> dependency = null)
{
// NOTE - here also we must insert a Lazy<object> but we can evaluate it right now
// and make sure we don't store a null value.
@@ -199,20 +187,17 @@ namespace Umbraco.Core.Cache
using (new WriteLock(_locker))
{
//NOTE: 'Insert' on System.Web.Caching.Cache actually does an add or update!
_cache.Insert(cacheKey, result, dependency, absolute, sliding, priority, removedCallback);
_cache.Insert(cacheKey, result, dependency?.Invoke(), absolute, sliding, priority, removedCallback);
}
}
public void InsertCacheItem(string cacheKey, Func<object> getCacheItem, TimeSpan? timeout = null, bool isSliding = false, CacheItemPriority priority = CacheItemPriority.Normal, CacheItemRemovedCallback removedCallback = null, string[] dependentFiles = null)
{
CacheDependency dependency = null;
if (dependentFiles != null && dependentFiles.Any())
{
dependency = new CacheDependency(dependentFiles);
}
InsertCacheItem(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback, dependency);
InsertCacheItemInternal(cacheKey, getCacheItem, timeout, isSliding, priority, removedCallback,
// Don't create a CacheDependency object unless we need it, see https://github.com/umbraco/Umbraco-CMS/issues/7773
() => dependentFiles != null && dependentFiles.Length > 0 ? new CacheDependency(dependentFiles) : null);
}
#endregion
}
}
}

31
src/umbraco.businesslogic/CacheHelper.cs
View File

@@ -1,31 +0,0 @@
//using System;
//using System.Web.Caching;
//namespace umbraco.BusinessLogic
//{
// internal class CacheHelper
// {
// public delegate TT GetCacheItemDelegate<TT>();
// public static TT GetCacheItem<TT>(string cacheKey, object syncLock,
// CacheItemPriority priority, CacheItemRemovedCallback refreshAction,
// CacheDependency cacheDependency, TimeSpan timeout, GetCacheItemDelegate<TT> getCacheItem)
// {
// object result = System.Web.HttpRuntime.Cache.Get(cacheKey);
// if (result == null)
// {
// lock (syncLock)
// {
// result = System.Web.HttpRuntime.Cache.Get(cacheKey);
// if (result == null)
// {
// result = getCacheItem();
// System.Web.HttpRuntime.Cache.Add(cacheKey, result, cacheDependency,
// DateTime.Now.Add(timeout), TimeSpan.Zero, priority, refreshAction);
// }
// }
// }
// return (TT)result;
// }
// }
//}

1
src/umbraco.businesslogic/umbraco.businesslogic.csproj
View File

@@ -203,7 +203,6 @@
<Compile Include="BasePages\UmbracoEnsuredPage.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CacheHelper.cs" />
<Compile Include="Exceptions\FileSecurityException.cs" />
<Compile Include="Exceptions\UserAuthorizationException.cs" />
<Compile Include="GlobalSettings.cs">