hipstercat/GiantsTools
1
0
Fork 0
mirror of https://github.com/ncblakely/GiantsTools synced 2024-06-01 23:01:46 +02:00
Code Issues Releases Wiki Activity

Fix expired servers not being cleaned up.

Browse Source
This commit is contained in:
Nick Blakely 2020-08-16 01:47:25 -07:00
parent 66b9ff5704
commit 2159bbc8b9
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Giants.Services/Services/ServerRegistryCleanupService.cs
View File

@ -62,7 +62,9 @@
{ {
List<string> expiredServers = (await this List<string> expiredServers = (await this
.serverRegistryStore .serverRegistryStore
.GetServerInfos(whereExpression: s => s.LastHeartbeat < (this.dateTimeProvider.UtcNow - this.timeoutPeriod))) .GetServerInfos(
whereExpression: s => s.LastHeartbeat < (this.dateTimeProvider.UtcNow - this.timeoutPeriod),
includeExpired: true))
.Select(s => s.id) .Select(s => s.id)
.ToList(); .ToList();

16
Giants.Services/Store/CosmosDbServerRegistryStore.cs
View File

@ -38,6 +38,7 @@
public async Task<IEnumerable<ServerInfo>> GetServerInfos( public async Task<IEnumerable<ServerInfo>> GetServerInfos(
Expression<Func<ServerInfo, bool>> whereExpression = null, Expression<Func<ServerInfo, bool>> whereExpression = null,
bool includeExpired = false,
string partitionKey = null) string partitionKey = null)
{ {
ConcurrentDictionary<string, ServerInfo> serverInfo = await this.memoryCache.GetOrCreateAsync(CacheKeys.ServerInfo, this.PopulateCache); ConcurrentDictionary<string, ServerInfo> serverInfo = await this.memoryCache.GetOrCreateAsync(CacheKeys.ServerInfo, this.PopulateCache);
@ -51,12 +52,18 @@
serverInfoQuery = serverInfoQuery.Where(whereExpression); serverInfoQuery = serverInfoQuery.Where(whereExpression);
} }
return serverInfoQuery.Where(c => c.LastHeartbeat > this.dateTimeProvider.UtcNow - this.timeoutPeriod) if (!includeExpired)
{
serverInfoQuery = serverInfoQuery.Where(c => c.LastHeartbeat > this.dateTimeProvider.UtcNow - this.timeoutPeriod);
}
return serverInfoQuery
.ToList(); .ToList();
} }
public async Task<IEnumerable<TSelect>> GetServerInfos<TSelect>( public async Task<IEnumerable<TSelect>> GetServerInfos<TSelect>(
Expression<Func<ServerInfo, TSelect>> selectExpression, Expression<Func<ServerInfo, TSelect>> selectExpression,
bool includeExpired = false,
Expression<Func<ServerInfo, bool>> whereExpression = null, Expression<Func<ServerInfo, bool>> whereExpression = null,
string partitionKey = null) string partitionKey = null)
{ {
@ -71,7 +78,12 @@
serverInfoQuery = serverInfoQuery.Where(whereExpression); serverInfoQuery = serverInfoQuery.Where(whereExpression);
} }
return serverInfoQuery.Where(c => c.LastHeartbeat > this.dateTimeProvider.UtcNow - this.timeoutPeriod) if (!includeExpired)
{
serverInfoQuery = serverInfoQuery.Where(c => c.LastHeartbeat > this.dateTimeProvider.UtcNow - this.timeoutPeriod);
}
return serverInfoQuery
.Select(selectExpression) .Select(selectExpression)
.ToList(); .ToList();
} }

3
Giants.Services/Store/IServerRegistryStore.cs
View File

@ -15,10 +15,11 @@
Task<ServerInfo> GetServerInfo(string ipAddress); Task<ServerInfo> GetServerInfo(string ipAddress);
Task<IEnumerable<ServerInfo>> GetServerInfos(Expression<Func<ServerInfo, bool>> whereExpression = null, string partitionKey = null); Task<IEnumerable<ServerInfo>> GetServerInfos(Expression<Func<ServerInfo, bool>> whereExpression = null, bool includeExpired = false, string partitionKey = null);
Task<IEnumerable<TSelect>> GetServerInfos<TSelect>( Task<IEnumerable<TSelect>> GetServerInfos<TSelect>(
Expression<Func<ServerInfo, TSelect>> selectExpression, Expression<Func<ServerInfo, TSelect>> selectExpression,
bool includeExpired = false,
Expression<Func<ServerInfo, bool>> whereExpression = null, Expression<Func<ServerInfo, bool>> whereExpression = null,
string partitionKey = null); string partitionKey = null);

11
Giants.Services/Store/InMemoryServerRegistryStore.cs
View File

@ -36,7 +36,10 @@
return Task.CompletedTask; return Task.CompletedTask;
} }
public Task<IEnumerable<ServerInfo>> GetServerInfos(Expression<Func<ServerInfo, bool>> whereExpression = null, string partitionKey = null) public Task<IEnumerable<ServerInfo>> GetServerInfos(
Expression<Func<ServerInfo, bool>> whereExpression = null,
bool includeExpired = false,
string partitionKey = null)
{ {
IQueryable<ServerInfo> serverInfoQuery = this.servers.Values.AsQueryable(); IQueryable<ServerInfo> serverInfoQuery = this.servers.Values.AsQueryable();
@ -48,7 +51,11 @@
return Task.FromResult(serverInfoQuery.AsEnumerable()); return Task.FromResult(serverInfoQuery.AsEnumerable());
} }
public Task<IEnumerable<TSelect>> GetServerInfos<TSelect>(Expression<Func<ServerInfo, TSelect>> selectExpression, Expression<Func<ServerInfo, bool>> whereExpression = null, string partitionKey = null) public Task<IEnumerable<TSelect>> GetServerInfos<TSelect>(
Expression<Func<ServerInfo, TSelect>> selectExpression,
bool includeExpired = false,
Expression <Func<ServerInfo, bool>> whereExpression = null,
string partitionKey = null)
{ {
IQueryable<ServerInfo> serverInfoQuery = this.servers.Values.AsQueryable(); IQueryable<ServerInfo> serverInfoQuery = this.servers.Values.AsQueryable();