Noi/BirthdayBot
1
0
Fork 0
mirror of https://github.com/NoiTheCat/BirthdayBot.git synced 2024-11-21 21:54:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modify shard reporting to be compact, informative

Browse source
This commit is contained in:
Noi 2020-10-24 22:43:20 -07:00
parent 651de4e78a
commit b6551eec2e
2 changed files with 64 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BackgroundServices/ConnectionStatus.cs
View file

@ -10,7 +10,7 @@ namespace BirthdayBot.BackgroundServices
class ConnectionStatus : BackgroundService class ConnectionStatus : BackgroundService
{ {
// About 5 minutes // About 5 minutes
private const int StableScore = 300 / ShardBackgroundWorker.Interval; public const int StableScore = 300 / ShardBackgroundWorker.Interval;
public bool Stable { get { return Score >= StableScore; } } public bool Stable { get { return Score >= StableScore; } }
public int Score { get; private set; } public int Score { get; private set; }

90
ShardManager.cs
View file

@ -1,4 +1,5 @@
using BirthdayBot.UserInterface; using BirthdayBot.BackgroundServices;
using BirthdayBot.UserInterface;
using Discord; using Discord;
using Discord.WebSocket; using Discord.WebSocket;
using System; using System;
@ -93,19 +94,12 @@ namespace BirthdayBot
/// <summary> /// <summary>
/// Creates and sets up a new shard instance. /// Creates and sets up a new shard instance.
/// Shuts down and removes an instance with equivalent ID if already exists.
/// </summary> /// </summary>
private async Task InitializeShard(int shardId) private async Task InitializeShard(int shardId)
{ {
ShardInstance newInstance; ShardInstance newInstance;
lock (_shards) lock (_shards)
{ {
Task disposeOldShard;
if (_shards[shardId] != null)
disposeOldShard = Task.Run(_shards[shardId].Dispose);
else
disposeOldShard = Task.CompletedTask;
var clientConf = new DiscordSocketConfig() var clientConf = new DiscordSocketConfig()
{ {
ShardId = shardId, ShardId = shardId,
@ -120,7 +114,6 @@ namespace BirthdayBot
var newClient = new DiscordSocketClient(clientConf); var newClient = new DiscordSocketClient(clientConf);
newInstance = new ShardInstance(this, newClient, _dispatchCommands); newInstance = new ShardInstance(this, newClient, _dispatchCommands);
disposeOldShard.Wait();
_shards[shardId] = newInstance; _shards[shardId] = newInstance;
} }
await newInstance.StartAsync().ConfigureAwait(false); await newInstance.StartAsync().ConfigureAwait(false);
@ -135,38 +128,81 @@ namespace BirthdayBot
Log($"Bot uptime: {Common.BotUptime}"); Log($"Bot uptime: {Common.BotUptime}");
// Gather statistical information within the lock // Gather statistical information within the lock
var guildCounts = new int[_shards.Length]; var guildInfo = new (int, int, TimeSpan)[_shards.Length]; // guild count, conn score, last run
var connScores = new int[_shards.Length]; var now = DateTimeOffset.UtcNow;
var lastRuns = new DateTimeOffset[_shards.Length];
ulong? botId = null; ulong? botId = null;
lock (_shards) lock (_shards)
{ {
for (int i = 0; i < _shards.Length; i++) for (int i = 0; i < _shards.Length; i++)
{ {
var shard = _shards[i]; var shard = _shards[i];
if (shard == null) continue;
guildCounts[i] = shard.DiscordClient.Guilds.Count;
connScores[i] = shard.ConnectionScore;
lastRuns[i] = shard.LastBackgroundRun;
botId ??= shard.DiscordClient.CurrentUser?.Id; botId ??= shard.DiscordClient.CurrentUser?.Id;
var guildCount = shard.DiscordClient.Guilds.Count;
var connScore = shard.ConnectionScore;
var lastRun = now - shard.LastBackgroundRun;
guildInfo[i] = (guildCount, connScore, lastRun);
} }
} }
// Guild count // Process info
var guildCountSum = guildCounts.Sum(); var guildCounts = guildInfo.Select(i => i.Item1);
Log($"Currently in {guildCountSum} guilds."); var guildTotal = guildCounts.Sum();
var guildAverage = guildCounts.Average();
Log($"Currently in {guildTotal} guilds. Average shard load: {guildAverage:0.0}.");
if (botId.HasValue) if (botId.HasValue)
await SendExternalStatistics(guildCountSum, botId.Value, _watchdogCancel.Token); await SendExternalStatistics(guildTotal, botId.Value, _watchdogCancel.Token).ConfigureAwait(false);
// Connection scores and worker health display // Health report
var now = DateTimeOffset.UtcNow; var goodShards = new List<int>();
for (int i = 0; i < connScores.Length; i++) var badShards = new List<int>(); // shards with a low connection score / long time since last work
var deadShards = new List<int>(); // shards to destroy and reinitialize
for (int i = 0; i < guildInfo.Length; i++)
{
var connScore = guildInfo[i].Item2;
var lastRun = guildInfo[i].Item3;
if (lastRun > new TimeSpan(0, 20, 0) || connScore < ConnectionStatus.StableScore)
{
badShards.Add(i);
// This is for now the only deciding factor on whether to discard a shard,
// without regards to score.
if (lastRun > new TimeSpan(1, 0, 0))
{
deadShards.Add(i);
}
}
else
{
goodShards.Add(i);
}
}
string catNumbers(IEnumerable<int> list, bool detailedInfo)
{
if (!list.Any()) return "--";
var result = new StringBuilder();
foreach (var item in list)
{
result.Append(item.ToString("00") + " ");
if (detailedInfo)
{
result.Remove(result.Length - 1, 1);
result.Append($"[{guildInfo[item].Item2:+000;-000}");
result.Append($" {Math.Floor(guildInfo[item].Item3.TotalMinutes):00}m");
result.Append($"{guildInfo[item].Item3.Seconds:00}s] ");
}
}
if (result.Length > 0) result.Remove(result.Length - 1, 1);
return result.ToString();
}
Log("Stable shards: " + catNumbers(goodShards, false));
if (badShards.Count > 0) Log("Unstable shards: " + catNumbers(badShards, true));
if (deadShards.Count > 0) Log("Shards to be restarted: " + catNumbers(deadShards, false));
{ {
var dur = now - lastRuns[i];
var lastRunDuration = $"Last run: {Math.Floor(dur.TotalMinutes):00}m{dur.Seconds:00}s ago";
Log($"Shard {i:00}: Score {connScores[i]:+0000;-0000} - " + lastRunDuration);
} }
// 120 second delay // 120 second delay