Skip to content

Fix audit storage size at startup reporting #3743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ramonsmits merged 1 commit into from
Oct 12, 2023
Merged

Fix audit storage size at startup reporting #3743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions src/ServiceControl.Audit.Persistence.RavenDb5/EmbeddedDatabase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using ByteSizeLib;
using NServiceBus.Logging;
using Raven.Client.Documents;
using Raven.Client.Documents.Conventions;
Expand Down Expand Up @@ -122,6 +124,8 @@ void Start(ServerOptions serverOptions)
}
}
});

RecordStartup();
}

public async Task<IDocumentStore> Connect(CancellationToken cancellationToken)
Expand Down Expand Up @@ -153,6 +157,74 @@ public void Dispose()
EmbeddedServer.Instance?.Dispose();
}

void RecordStartup()
{
var dataSize = DataSize();
var folderSize = FolderSize(configuration.ServerConfiguration.DbPath);

var startupMessage = $@"
-------------------------------------------------------------
Database Size: {ByteSize.FromBytes(dataSize).ToString("#.##", CultureInfo.InvariantCulture)}
Database Folder Size: {ByteSize.FromBytes(folderSize).ToString("#.##", CultureInfo.InvariantCulture)}
-------------------------------------------------------------";

logger.Info(startupMessage);
}

long DataSize()
{
var datafilePath = Path.Combine(configuration.ServerConfiguration.DbPath, "Databases", configuration.Name, "Raven.voron");

try
{
var info = new FileInfo(datafilePath);
if (!info.Exists)
{
return -1;
}
return info.Length;
}
catch
{
return -1;
}
}

long FolderSize(string path)
{
try
{
var dir = new DirectoryInfo(path);
var dirSize = DirSize(dir);
return dirSize;
}
catch
{
return -1;
}
}

static long DirSize(DirectoryInfo d)
{
long size = 0;
if (d.Exists)
{
FileInfo[] fis = d.GetFiles();
foreach (FileInfo fi in fis)
{
size += fi.Length;
}

DirectoryInfo[] dis = d.GetDirectories();
foreach (DirectoryInfo di in dis)
{
size += DirSize(di);
}
}

return size;
}

CancellationTokenSource shutdownTokenSource = new CancellationTokenSource();
bool restartRequired;
readonly DatabaseConfiguration configuration;
Expand Down
1 change: 1 addition & 0 deletions ...erviceControl.Audit.Persistence.RavenDb5/ServiceControl.Audit.Persistence.RavenDb5.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="ByteSize" />
<PackageReference Include="Lucene.Net" />
<PackageReference Include="NServiceBus.CustomChecks" />
<PackageReference Include="RavenDB.Embedded" />
Expand Down
66 changes: 1 addition & 65 deletions src/ServiceControl.Audit/Infrastructure/Bootstrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ namespace ServiceControl.Audit.Infrastructure
{
using System;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Net;
using Auditing;
using ByteSizeLib;
using Metrics;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
Expand Down Expand Up @@ -109,76 +106,15 @@ static TransportSettings MapSettings(Settings.Settings settings)
return transportSettings;
}

long DataSize(string dbPath)
{
if (string.IsNullOrEmpty(dbPath))
{
return 0;
}

var datafilePath = Path.Combine(dbPath, "data");

try
{
var info = new FileInfo(datafilePath);

return info.Length;
}
catch (Exception)
{
return 0;
}
}

long FolderSize(string dbPath)
{
if (string.IsNullOrEmpty(dbPath))
{
return 0;
}

try
{
var dir = new DirectoryInfo(dbPath);
var dirSize = DirSize(dir);
return dirSize;
}
catch
{
return -1;
}
}

static long DirSize(DirectoryInfo d)
{
long size = 0;
FileInfo[] fis = d.GetFiles();
foreach (FileInfo fi in fis)
{
size += fi.Length;
}
DirectoryInfo[] dis = d.GetDirectories();
foreach (DirectoryInfo di in dis)
{
size += DirSize(di);
}
return size;
}

void RecordStartup(LoggingSettings loggingSettings, EndpointConfiguration endpointConfiguration, IPersistenceConfiguration persistenceConfiguration)
{
var version = FileVersionInfo.GetVersionInfo(typeof(Bootstrapper).Assembly.Location).ProductVersion;
var dbPath = SettingsReader<string>.Read("DbPath", null);
var dataSize = DataSize(dbPath);
var folderSize = FolderSize(dbPath);

var startupMessage = $@"
-------------------------------------------------------------
ServiceControl Audit Version: {version}
Audit Retention Period: {settings.AuditRetentionPeriod}
Forwarding Audit Messages: {settings.ForwardAuditMessages}
Database Size: {ByteSize.FromBytes(dataSize).ToString("#.##", CultureInfo.InvariantCulture)}
Database Folder Size: {ByteSize.FromBytes(folderSize).ToString("#.##", CultureInfo.InvariantCulture)}
ServiceControl Logging Level: {loggingSettings.LoggingLevel}
RavenDB Logging Level: {loggingSettings.RavenDBLogLevel}
Transport Customization: {settings.TransportType},
Expand All @@ -202,4 +138,4 @@ void RecordStartup(LoggingSettings loggingSettings, EndpointConfiguration endpoi
TransportSettings transportSettings;
TransportCustomization transportCustomization;
}
}
}