add --buildstore-disksizelimit-percent to zenstorageserver (#966)

- Improvement: Add option `--buildstore-disksizelimit-percent` - Max percentage of total drive capacity (of --data-dir drive) for build storage. When combined with `--buildstore-disksizelimit`, the lower value wins.

1 files changed, 16 insertions, 0 deletions

diff --git a/src/zenserver/storage/storageconfig.cpp b/src/zenserver/storage/storageconfig.cpp
index b615af280..bb4f053e4 100644
--- a/src/zenserver/storage/storageconfig.cpp
+++ b/src/zenserver/storage/storageconfig.cpp
@@ -57,6 +57,12 @@ ZenStorageServerConfigurator::ValidateOptions()
 		ZEN_WARN("'--gc-v2=false' is deprecated, reverting to '--gc-v2=true'");
 		ServerOptions.GcConfig.UseGCV2 = true;
 	}
+	if (ServerOptions.BuildStoreConfig.MaxDiskSpaceLimitPercent > 100)
+	{
+		throw OptionParseException(fmt::format("'--buildstore-disksizelimit-percent' ('{}') is invalid, must be between 1 and 100.",
+											   ServerOptions.BuildStoreConfig.MaxDiskSpaceLimitPercent),
+								   {});
+	}
 }
 
 class ZenStructuredCacheBucketsConfigOption : public LuaConfig::OptionValue
@@ -382,6 +388,9 @@ ZenStorageServerConfigurator::AddConfigOptions(LuaConfig::Options& LuaOptions)
 	////// buildsstore
 	LuaOptions.AddOption("server.buildstore.enabled"sv, ServerOptions.BuildStoreConfig.Enabled, "buildstore-enabled"sv);
 	LuaOptions.AddOption("server.buildstore.disksizelimit"sv, ServerOptions.BuildStoreConfig.MaxDiskSpaceLimit, "buildstore-disksizelimit");
+	LuaOptions.AddOption("server.buildstore.disksizelimitpercent"sv,
+						 ServerOptions.BuildStoreConfig.MaxDiskSpaceLimitPercent,
+						 "buildstore-disksizelimit-percent");
 
 	////// cache
 	LuaOptions.AddOption("cache.enable"sv, ServerOptions.StructuredCacheConfig.Enabled);
@@ -1035,6 +1044,13 @@ ZenStorageServerCmdLineOptions::AddBuildStoreOptions(cxxopts::Options& options,
 					   "Max number of bytes before build store entries get evicted. Default set to 1099511627776 (1TB week)",
 					   cxxopts::value<uint64_t>(ServerOptions.BuildStoreConfig.MaxDiskSpaceLimit)->default_value("1099511627776"),
 					   "");
+	options.add_option("buildstore",
+					   "",
+					   "buildstore-disksizelimit-percent",
+					   "Max percentage (1-100) of total drive capacity (of --data-dir drive) before build store entries get evicted. "
+					   "0 (default) disables this limit. When combined with --buildstore-disksizelimit, the lower value wins.",
+					   cxxopts::value<uint32_t>(ServerOptions.BuildStoreConfig.MaxDiskSpaceLimitPercent)->default_value("0"),
+					   "");
 }
 
 void