imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolved #762 Distributed Cache should be fault tolerant

Browse Source
pull/765/head
Yunus Emre Kalkan 7 years ago
parent 35d573b50c
commit 9fa420d292
3 changed files with 176 additions and 37 deletions
Show Stats Download Patch File Download Diff File

149
framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs
Unescape View File

@ -31,13 +31,18 @@ namespace Volo.Abp.Caching
protected DistributedCacheEntryOptions DefaultCacheOptions;
private readonly CacheOptions _cacheOption;
private readonly DistributedCacheOptions _distributedCacheOption;
public DistributedCache(
IOptions<CacheOptions> cacheOption,
IOptions<DistributedCacheOptions> distributedCacheOption,
IDistributedCache cache,
ICancellationTokenProvider cancellationTokenProvider,
IObjectSerializer objectSerializer,
ICurrentTenant currentTenant)
{
_distributedCacheOption = distributedCacheOption.Value;
_cacheOption = cacheOption.Value;
Cache = cache;
CancellationTokenProvider = cancellationTokenProvider;
@ -47,9 +52,25 @@ namespace Volo.Abp.Caching
SetDefaultOptions();
}
public virtual TCacheItem Get(string key)
public virtual TCacheItem Get(string key, bool? hideErrors = null)
{
hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
byte[] cachedBytes;
try
{
var cachedBytes = Cache.Get(NormalizeKey(key));
cachedBytes = Cache.Get(NormalizeKey(key));
}
catch (Exception)
{
if ((bool) hideErrors)
{
return null;
}
throw;
}
if (cachedBytes == null)
{
return null;
@ -58,9 +79,25 @@ namespace Volo.Abp.Caching
return ObjectSerializer.Deserialize<TCacheItem>(cachedBytes);
}
public virtual async Task<TCacheItem> GetAsync(string key, CancellationToken token = default)
public virtual async Task<TCacheItem> GetAsync(string key, bool? hideErrors = null, CancellationToken token = default)
{
hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
byte[] cachedBytes;
try
{
cachedBytes = await Cache.GetAsync(NormalizeKey(key), CancellationTokenProvider.FallbackToProvider(token));
}
catch (Exception)
{
var cachedBytes = await Cache.GetAsync(NormalizeKey(key), CancellationTokenProvider.FallbackToProvider(token));
if ((bool)hideErrors)
{
return null;
}
throw;
}
if (cachedBytes == null)
{
return null;
@ -72,9 +109,10 @@ namespace Volo.Abp.Caching
public TCacheItem GetOrAdd(
string key,
Func<TCacheItem> factory,
Func<DistributedCacheEntryOptions> optionsFactory = null)
Func<DistributedCacheEntryOptions> optionsFactory = null,
bool? hideErrors = null)
{
var value = Get(key);
var value = Get(key, hideErrors);
if (value != null)
{
return value;
@ -82,14 +120,14 @@ namespace Volo.Abp.Caching
using (AsyncLock.Lock())
{
value = Get(key);
value = Get(key, hideErrors);
if (value != null)
{
return value;
}
value = factory();
Set(key, value, optionsFactory?.Invoke());
Set(key, value, optionsFactory?.Invoke(), hideErrors);
}
return value;
@ -99,10 +137,11 @@ namespace Volo.Abp.Caching
string key,
Func<Task<TCacheItem>> factory,
Func<DistributedCacheEntryOptions> optionsFactory = null,
bool? hideErrors = null,
CancellationToken token = default)
{
token = CancellationTokenProvider.FallbackToProvider(token);
var value = await GetAsync(key, token);
var value = await GetAsync(key, hideErrors, token);
if (value != null)
{
return value;
@ -110,20 +149,24 @@ namespace Volo.Abp.Caching
using (await AsyncLock.LockAsync(token))
{
value = await GetAsync(key, token);
value = await GetAsync(key, hideErrors, token);
if (value != null)
{
return value;
}
value = await factory();
await SetAsync(key, value, optionsFactory?.Invoke(), token);
await SetAsync(key, value, optionsFactory?.Invoke(), hideErrors, token);
}
return value;
}
public virtual void Set(string key, TCacheItem value, DistributedCacheEntryOptions options = null)
public virtual void Set(string key, TCacheItem value, DistributedCacheEntryOptions options = null, bool? hideErrors = null)
{
hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
try
{
Cache.Set(
NormalizeKey(key),
@ -131,8 +174,20 @@ namespace Volo.Abp.Caching
options ?? DefaultCacheOptions
);
}
catch (Exception)
{
if (!(bool) hideErrors)
{
throw;
}
}
}
public virtual Task SetAsync(string key, TCacheItem value, DistributedCacheEntryOptions options = null, bool? hideErrors = null, CancellationToken token = default)
{
hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
public virtual Task SetAsync(string key, TCacheItem value, DistributedCacheEntryOptions options = null, CancellationToken token = default)
try
{
return Cache.SetAsync(
NormalizeKey(key),
@ -141,26 +196,85 @@ namespace Volo.Abp.Caching
CancellationTokenProvider.FallbackToProvider(token)
);
}
catch (Exception)
{
if ((bool)hideErrors)
{
return Task.CompletedTask;
}
throw;
}
}
public virtual void Refresh(string key)
public virtual void Refresh(string key, bool? hideErrors = null)
{
hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
try
{
Cache.Refresh(NormalizeKey(key));
}
catch (Exception)
{
if (!(bool) hideErrors)
{
throw;
}
}
}
public virtual Task RefreshAsync(string key, bool? hideErrors = null, CancellationToken token = default)
{
hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
public virtual Task RefreshAsync(string key, CancellationToken token = default)
try
{
return Cache.RefreshAsync(NormalizeKey(key), CancellationTokenProvider.FallbackToProvider(token));
}
catch (Exception)
{
if ((bool)hideErrors)
{
return Task.CompletedTask;
}
throw;
}
}
public virtual void Remove(string key, bool? hideErrors = null)
{
hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
public virtual void Remove(string key)
try
{
Cache.Remove(NormalizeKey(key));
}
catch (Exception)
{
if (!(bool)hideErrors)
{
throw;
}
}
}
public virtual Task RemoveAsync(string key, CancellationToken token = default)
public virtual Task RemoveAsync(string key, bool? hideErrors = null, CancellationToken token = default)
{
hideErrors = hideErrors ?? _distributedCacheOption.HideErrors;
try
{
return Cache.RemoveAsync(NormalizeKey(key), CancellationTokenProvider.FallbackToProvider(token));
}
catch (Exception)
{
if ((bool)hideErrors)
{
return Task.CompletedTask;
}
throw;
}
}
protected virtual string NormalizeKey(string key)
{
@ -173,6 +287,7 @@ namespace Volo.Abp.Caching
return normalizedKey;
}
protected virtual DistributedCacheEntryOptions GetDefaultCacheEntryOptions()
{
foreach (var configure in _cacheOption.CacheConfigurators)

14
framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCacheOptions.cs
Unescape View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Volo.Abp.Caching
{
public class DistributedCacheOptions
{
/// <summary>
/// Throw or hide exceptions for the distributed cache.
/// </summary>
public bool HideErrors { get; set; } = true;
}
}

20
framework/src/Volo.Abp.Caching/Volo/Abp/Caching/IDistributedCache.cs
Unescape View File

@ -10,55 +10,65 @@ namespace Volo.Abp.Caching
where TCacheItem : class
{
TCacheItem Get(
string key
string key,
bool? hideErrors = null
);
Task<TCacheItem> GetAsync(
[NotNull] string key,
bool? hideErrors = null,
CancellationToken token = default
);
TCacheItem GetOrAdd(
string key,
Func<TCacheItem> factory,
Func<DistributedCacheEntryOptions> optionsFactory = null
Func<DistributedCacheEntryOptions> optionsFactory = null,
bool? hideErrors = null
);
Task<TCacheItem> GetOrAddAsync(
[NotNull] string key,
Func<Task<TCacheItem>> factory,
Func<DistributedCacheEntryOptions> optionsFactory = null,
bool? hideErrors = null,
CancellationToken token = default
);
void Set(
string key,
TCacheItem value,
DistributedCacheEntryOptions options = null
DistributedCacheEntryOptions options = null,
bool? hideErrors = null
);
Task SetAsync(
[NotNull] string key,
[NotNull] TCacheItem value,
[CanBeNull] DistributedCacheEntryOptions options = null,
bool? hideErrors = null,
CancellationToken token = default
);
void Refresh(
string key
string key,
bool? hideErrors = null
);
Task RefreshAsync(
string key,
bool? hideErrors = null,
CancellationToken token = default
);
void Remove(
string key
string key,
bool? hideErrors = null
);
Task RemoveAsync(
string key,
bool? hideErrors = null,
CancellationToken token = default
);
}

Write Preview
Loading…
Cancel
Save