minor GC API cleanup

Scrub -> ScrubStorage
Trigger -> TriggerGc (to make relationship to TriggerScrub clearer)

18 files changed, 73 insertions, 73 deletions

diff --git a/src/zenserver/admin/admin.cpp b/src/zenserver/admin/admin.cpp
index 7aa1b48d1..3a93c9aec 100644
--- a/src/zenserver/admin/admin.cpp
+++ b/src/zenserver/admin/admin.cpp
@@ -39,7 +39,7 @@ HttpAdminService::HttpAdminService(GcScheduler& Scheduler) : m_GcScheduler(Sched
 		[this](HttpRouterRequest& Req) {
 			HttpServerRequest&					 HttpReq = Req.ServerRequest();
 			const HttpServerRequest::QueryParams Params	 = HttpReq.GetQueryParams();
-			GcScheduler::TriggerParams			 GcParams;
+			GcScheduler::TriggerGcParams		 GcParams;
 
 			if (auto Param = Params.GetValue("smallobjects"); Param.empty() == false)
 			{
@@ -62,7 +62,7 @@ HttpAdminService::HttpAdminService(GcScheduler& Scheduler) : m_GcScheduler(Sched
 				}
 			}
 
-			const bool Started = m_GcScheduler.Trigger(GcParams);
+			const bool Started = m_GcScheduler.TriggerGc(GcParams);
 
 			CbObjectWriter Response;
 			Response << "Status"sv << (Started ? "Started"sv : "Running"sv);
diff --git a/src/zenserver/cache/structuredcache.cpp b/src/zenserver/cache/structuredcache.cpp
index 9f2a448bb..c9f942033 100644
--- a/src/zenserver/cache/structuredcache.cpp
+++ b/src/zenserver/cache/structuredcache.cpp
@@ -356,7 +356,7 @@ HttpStructuredCacheService::Flush()
 }
 
 void
-HttpStructuredCacheService::Scrub(ScrubContext& Ctx)
+HttpStructuredCacheService::ScrubStorage(ScrubContext& Ctx)
 {
 	if (m_LastScrubTime == Ctx.ScrubTimestamp())
 	{
@@ -365,8 +365,8 @@ HttpStructuredCacheService::Scrub(ScrubContext& Ctx)
 
 	m_LastScrubTime = Ctx.ScrubTimestamp();
 
-	m_CidStore.Scrub(Ctx);
-	m_CacheStore.Scrub(Ctx);
+	m_CidStore.ScrubStorage(Ctx);
+	m_CacheStore.ScrubStorage(Ctx);
 }
 
 void
diff --git a/src/zenserver/cache/structuredcache.h b/src/zenserver/cache/structuredcache.h
index 77a0aee6a..add3eb281 100644
--- a/src/zenserver/cache/structuredcache.h
+++ b/src/zenserver/cache/structuredcache.h
@@ -79,7 +79,7 @@ public:
 	virtual const char* BaseUri() const override;
 	virtual void		HandleRequest(HttpServerRequest& Request) override;
 	void				Flush();
-	void				Scrub(ScrubContext& Ctx);
+	void				ScrubStorage(ScrubContext& Ctx);
 
 private:
 	struct CacheRef
diff --git a/src/zenserver/cache/structuredcachestore.cpp b/src/zenserver/cache/structuredcachestore.cpp
index 59a047c08..e07a597e3 100644
--- a/src/zenserver/cache/structuredcachestore.cpp
+++ b/src/zenserver/cache/structuredcachestore.cpp
@@ -295,7 +295,7 @@ ZenCacheNamespace::Flush()
 }
 
 void
-ZenCacheNamespace::Scrub(ScrubContext& Ctx)
+ZenCacheNamespace::ScrubStorage(ScrubContext& Ctx)
 {
 	if (m_LastScrubTime == Ctx.ScrubTimestamp())
 	{
@@ -304,8 +304,8 @@ ZenCacheNamespace::Scrub(ScrubContext& Ctx)
 
 	m_LastScrubTime = Ctx.ScrubTimestamp();
 
-	m_DiskLayer.Scrub(Ctx);
-	m_MemLayer.Scrub(Ctx);
+	m_DiskLayer.ScrubStorage(Ctx);
+	m_MemLayer.ScrubStorage(Ctx);
 }
 
 void
@@ -478,13 +478,13 @@ ZenCacheMemoryLayer::Drop()
 }
 
 void
-ZenCacheMemoryLayer::Scrub(ScrubContext& Ctx)
+ZenCacheMemoryLayer::ScrubStorage(ScrubContext& Ctx)
 {
 	RwLock::SharedLockScope _(m_Lock);
 
 	for (auto& Kv : m_Buckets)
 	{
-		Kv.second->Scrub(Ctx);
+		Kv.second->ScrubStorage(Ctx);
 	}
 }
 
@@ -551,7 +551,7 @@ ZenCacheMemoryLayer::GetBucketInfo(std::string_view Bucket) const
 }
 
 void
-ZenCacheMemoryLayer::CacheBucket::Scrub(ScrubContext& Ctx)
+ZenCacheMemoryLayer::CacheBucket::ScrubStorage(ScrubContext& Ctx)
 {
 	RwLock::SharedLockScope _(m_BucketLock);
 
@@ -1297,7 +1297,7 @@ ZenCacheDiskLayer::CacheBucket::SaveManifest()
 }
 
 void
-ZenCacheDiskLayer::CacheBucket::Scrub(ScrubContext& Ctx)
+ZenCacheDiskLayer::CacheBucket::ScrubStorage(ScrubContext& Ctx)
 {
 	std::vector<IoHash>				BadKeys;
 	uint64_t						ChunkCount{0}, ChunkBytes{0};
@@ -2413,14 +2413,14 @@ ZenCacheDiskLayer::Flush()
 }
 
 void
-ZenCacheDiskLayer::Scrub(ScrubContext& Ctx)
+ZenCacheDiskLayer::ScrubStorage(ScrubContext& Ctx)
 {
 	RwLock::SharedLockScope _(m_Lock);
 
 	for (auto& Kv : m_Buckets)
 	{
 		CacheBucket& Bucket = *Kv.second;
-		Bucket.Scrub(Ctx);
+		Bucket.ScrubStorage(Ctx);
 	}
 }
 
@@ -2669,9 +2669,9 @@ ZenCacheStore::Flush()
 }
 
 void
-ZenCacheStore::Scrub(ScrubContext& Ctx)
+ZenCacheStore::ScrubStorage(ScrubContext& Ctx)
 {
-	IterateNamespaces([&](std::string_view, ZenCacheNamespace& Store) { Store.Scrub(Ctx); });
+	IterateNamespaces([&](std::string_view, ZenCacheNamespace& Store) { Store.ScrubStorage(Ctx); });
 }
 
 CacheValueDetails
@@ -3756,8 +3756,8 @@ TEST_CASE("z$.scrub")
 	CreateRecords(true, "mybucket"sv, StructuredCids, AttachmentSizes);
 
 	ScrubContext ScrubCtx;
-	Zcs.Scrub(ScrubCtx);
-	CidStore.Scrub(ScrubCtx);
+	Zcs.ScrubStorage(ScrubCtx);
+	CidStore.ScrubStorage(ScrubCtx);
 	CHECK(ScrubCtx.ScrubbedChunks() == (StructuredCids.size() + StructuredCids.size() * AttachmentSizes.size()) + UnstructuredCids.size());
 	CHECK(ScrubCtx.BadCids().GetSize() == 0);
 }
diff --git a/src/zenserver/cache/structuredcachestore.h b/src/zenserver/cache/structuredcachestore.h
index f94babb64..5ae8b97a0 100644
--- a/src/zenserver/cache/structuredcachestore.h
+++ b/src/zenserver/cache/structuredcachestore.h
@@ -229,7 +229,7 @@ public:
 	void	 Put(std::string_view Bucket, const IoHash& HashKey, const ZenCacheValue& Value);
 	void	 Drop();
 	bool	 DropBucket(std::string_view Bucket);
-	void	 Scrub(ScrubContext& Ctx);
+	void	 ScrubStorage(ScrubContext& Ctx);
 	void	 GatherAccessTimes(zen::access_tracking::AccessTimes& AccessTimes);
 	void	 Reset();
 	uint64_t TotalSize() const;
@@ -265,7 +265,7 @@ private:
 		bool			Get(const IoHash& HashKey, ZenCacheValue& OutValue);
 		void			Put(const IoHash& HashKey, const ZenCacheValue& Value);
 		void			Drop();
-		void			Scrub(ScrubContext& Ctx);
+		void			ScrubStorage(ScrubContext& Ctx);
 		void			GatherAccessTimes(std::vector<zen::access_tracking::KeyAccessTime>& AccessTimes);
 		inline uint64_t TotalSize() const { return m_TotalSize; }
 		uint64_t		EntryCount() const;
@@ -310,7 +310,7 @@ public:
 	bool Drop();
 	bool DropBucket(std::string_view Bucket);
 	void Flush();
-	void Scrub(ScrubContext& Ctx);
+	void ScrubStorage(ScrubContext& Ctx);
 	void GatherReferences(GcContext& GcCtx);
 	void CollectGarbage(GcContext& GcCtx);
 	void UpdateAccessTimes(const zen::access_tracking::AccessTimes& AccessTimes);
@@ -337,7 +337,7 @@ private:
 		void Put(const IoHash& HashKey, const ZenCacheValue& Value);
 		bool Drop();
 		void Flush();
-		void Scrub(ScrubContext& Ctx);
+		void ScrubStorage(ScrubContext& Ctx);
 		void GatherReferences(GcContext& GcCtx);
 		void CollectGarbage(GcContext& GcCtx);
 		void UpdateAccessTimes(const std::vector<zen::access_tracking::KeyAccessTime>& AccessTimes);
@@ -444,7 +444,7 @@ public:
 	bool					  Drop();
 	bool					  DropBucket(std::string_view Bucket);
 	void					  Flush();
-	void					  Scrub(ScrubContext& Ctx);
+	void					  ScrubStorage(ScrubContext& Ctx);
 	uint64_t				  DiskLayerThreshold() const { return m_DiskLayerSizeThreshold; }
 	virtual void			  GatherReferences(GcContext& GcCtx) override;
 	virtual void			  CollectGarbage(GcContext& GcCtx) override;
@@ -497,7 +497,7 @@ public:
 	bool DropBucket(std::string_view Namespace, std::string_view Bucket);
 	bool DropNamespace(std::string_view Namespace);
 	void Flush();
-	void Scrub(ScrubContext& Ctx);
+	void ScrubStorage(ScrubContext& Ctx);
 
 	CacheValueDetails GetValueDetails(const std::string_view NamespaceFilter,
 									  const std::string_view BucketFilter,
diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 7fd9bcae0..381f163aa 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -642,7 +642,7 @@ ProjectStore::Oplog::Flush()
 }
 
 void
-ProjectStore::Oplog::Scrub(ScrubContext& Ctx) const
+ProjectStore::Oplog::ScrubStorage(ScrubContext& Ctx) const
 {
 	ZEN_UNUSED(Ctx);
 }
@@ -1535,7 +1535,7 @@ ProjectStore::Project::Flush()
 }
 
 void
-ProjectStore::Project::Scrub(ScrubContext& Ctx)
+ProjectStore::Project::ScrubStorage(ScrubContext& Ctx)
 {
 	// Scrubbing needs to check all existing oplogs
 	std::vector<std::string> OpLogs = ScanForOplogs();
@@ -1546,7 +1546,7 @@ ProjectStore::Project::Scrub(ScrubContext& Ctx)
 	IterateOplogs([&](const Oplog& Ops) {
 		if (!IsExpired(GcClock::TimePoint::max(), Ops))
 		{
-			Ops.Scrub(Ctx);
+			Ops.ScrubStorage(Ctx);
 		}
 	});
 }
@@ -1753,7 +1753,7 @@ ProjectStore::Flush()
 }
 
 void
-ProjectStore::Scrub(ScrubContext& Ctx)
+ProjectStore::ScrubStorage(ScrubContext& Ctx)
 {
 	DiscoverProjects();
 
@@ -1773,7 +1773,7 @@ ProjectStore::Scrub(ScrubContext& Ctx)
 	}
 	for (const Ref<Project>& Project : Projects)
 	{
-		Project->Scrub(Ctx);
+		Project->ScrubStorage(Ctx);
 	}
 }
 
diff --git a/src/zenserver/projectstore/projectstore.h b/src/zenserver/projectstore/projectstore.h
index b446de543..37093c0fb 100644
--- a/src/zenserver/projectstore/projectstore.h
+++ b/src/zenserver/projectstore/projectstore.h
@@ -111,7 +111,7 @@ public:
 
 		spdlog::logger& Log() { return m_OuterProject->Log(); }
 		void			Flush();
-		void			Scrub(ScrubContext& Ctx) const;
+		void			ScrubStorage(ScrubContext& Ctx) const;
 		void			GatherReferences(GcContext& GcCtx);
 		static uint64_t TotalSize(const std::filesystem::path& BasePath);
 		uint64_t		TotalSize() const;
@@ -220,7 +220,7 @@ public:
 		void					  Write();
 		[[nodiscard]] static bool Exists(const std::filesystem::path& BasePath);
 		void					  Flush();
-		void					  Scrub(ScrubContext& Ctx);
+		void					  ScrubStorage(ScrubContext& Ctx);
 		spdlog::logger&			  Log();
 		void					  GatherReferences(GcContext& GcCtx);
 		uint64_t				  TotalSize() const;
@@ -253,7 +253,7 @@ public:
 	bool		 DeleteProject(std::string_view ProjectId);
 	bool		 Exists(std::string_view ProjectId);
 	void		 Flush();
-	void		 Scrub(ScrubContext& Ctx);
+	void		 ScrubStorage(ScrubContext& Ctx);
 	void		 DiscoverProjects();
 	void		 IterateProjects(std::function<void(Project& Prj)>&& Fn);
 
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index ce5e4e964..c4a4d1d41 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -427,7 +427,7 @@ public:
 	{
 		// This is disabled for now, awaiting better scheduling
 		//
-		// Scrub();
+		// ScrubStorage();
 
 		if (m_ProcessMonitor.IsActive())
 		{
@@ -594,15 +594,15 @@ public:
 		}
 	}
 
-	void Scrub()
+	void ScrubStorage()
 	{
 		Stopwatch Timer;
 		ZEN_INFO("Storage validation STARTING");
 
 		ScrubContext Ctx;
-		m_CidStore->Scrub(Ctx);
-		m_ProjectStore->Scrub(Ctx);
-		m_StructuredCacheService->Scrub(Ctx);
+		m_CidStore->ScrubStorage(Ctx);
+		m_ProjectStore->ScrubStorage(Ctx);
+		m_StructuredCacheService->ScrubStorage(Ctx);
 
 		const uint64_t ElapsedTimeMs = Timer.GetElapsedTimeMs();
 
diff --git a/src/zenstore/cas.cpp b/src/zenstore/cas.cpp
index fdec78c60..33e1ae0e0 100644
--- a/src/zenstore/cas.cpp
+++ b/src/zenstore/cas.cpp
@@ -52,7 +52,7 @@ public:
 	virtual bool				   ContainsChunk(const IoHash& ChunkHash) override;
 	virtual void				   FilterChunks(HashKeySet& InOutChunks) override;
 	virtual void				   Flush() override;
-	virtual void				   Scrub(ScrubContext& Ctx) override;
+	virtual void				   ScrubStorage(ScrubContext& Ctx) override;
 	virtual void				   GarbageCollect(GcContext& GcCtx) override;
 	virtual CidStoreSize		   TotalSize() const override;
 
@@ -258,7 +258,7 @@ CasImpl::Flush()
 }
 
 void
-CasImpl::Scrub(ScrubContext& Ctx)
+CasImpl::ScrubStorage(ScrubContext& Ctx)
 {
 	if (m_LastScrubTime == Ctx.ScrubTimestamp())
 	{
@@ -267,9 +267,9 @@ CasImpl::Scrub(ScrubContext& Ctx)
 
 	m_LastScrubTime = Ctx.ScrubTimestamp();
 
-	m_SmallStrategy.Scrub(Ctx);
-	m_TinyStrategy.Scrub(Ctx);
-	m_LargeStrategy.Scrub(Ctx);
+	m_SmallStrategy.ScrubStorage(Ctx);
+	m_TinyStrategy.ScrubStorage(Ctx);
+	m_LargeStrategy.ScrubStorage(Ctx);
 }
 
 void
@@ -318,7 +318,7 @@ TEST_CASE("CasStore")
 	Store->Initialize(config);
 
 	ScrubContext Ctx;
-	Store->Scrub(Ctx);
+	Store->ScrubStorage(Ctx);
 
 	IoBuffer Value1{16};
 	memcpy(Value1.MutableData(), "1234567890123456", 16);
diff --git a/src/zenstore/cas.h b/src/zenstore/cas.h
index 9c48d4707..e79dea6c9 100644
--- a/src/zenstore/cas.h
+++ b/src/zenstore/cas.h
@@ -51,7 +51,7 @@ public:
 	virtual bool		 ContainsChunk(const IoHash& ChunkHash)																   = 0;
 	virtual void		 FilterChunks(HashKeySet& InOutChunks)																   = 0;
 	virtual void		 Flush()																							   = 0;
-	virtual void		 Scrub(ScrubContext& Ctx)																			   = 0;
+	virtual void		 ScrubStorage(ScrubContext& Ctx)																	   = 0;
 	virtual void		 GarbageCollect(GcContext& GcCtx)																	   = 0;
 	virtual CidStoreSize TotalSize() const																					   = 0;
 
diff --git a/src/zenstore/cidstore.cpp b/src/zenstore/cidstore.cpp
index 5a5116faf..8d4679128 100644
--- a/src/zenstore/cidstore.cpp
+++ b/src/zenstore/cidstore.cpp
@@ -49,7 +49,7 @@ struct CidStore::Impl
 
 	void Flush() { m_CasStore.Flush(); }
 
-	void Scrub(ScrubContext& Ctx)
+	void ScrubStorage(ScrubContext& Ctx)
 	{
 		if (Ctx.ScrubTimestamp() == m_LastScrubTime)
 		{
@@ -58,7 +58,7 @@ struct CidStore::Impl
 
 		m_LastScrubTime = Ctx.ScrubTimestamp();
 
-		m_CasStore.Scrub(Ctx);
+		m_CasStore.ScrubStorage(Ctx);
 	}
 
 	uint64_t m_LastScrubTime = 0;
@@ -111,9 +111,9 @@ CidStore::Flush()
 }
 
 void
-CidStore::Scrub(ScrubContext& Ctx)
+CidStore::ScrubStorage(ScrubContext& Ctx)
 {
-	m_Impl->Scrub(Ctx);
+	m_Impl->ScrubStorage(Ctx);
 }
 
 CidStoreSize
diff --git a/src/zenstore/compactcas.cpp b/src/zenstore/compactcas.cpp
index c513aa132..47c31eb5a 100644
--- a/src/zenstore/compactcas.cpp
+++ b/src/zenstore/compactcas.cpp
@@ -233,7 +233,7 @@ CasContainerStrategy::Flush()
 }
 
 void
-CasContainerStrategy::Scrub(ScrubContext& Ctx)
+CasContainerStrategy::ScrubStorage(ScrubContext& Ctx)
 {
 	std::vector<IoHash>				BadKeys;
 	uint64_t						ChunkCount{0}, ChunkBytes{0};
diff --git a/src/zenstore/compactcas.h b/src/zenstore/compactcas.h
index a043e62c1..eebe3e7d2 100644
--- a/src/zenstore/compactcas.h
+++ b/src/zenstore/compactcas.h
@@ -61,7 +61,7 @@ struct CasContainerStrategy final : public GcStorage
 									  uint64_t					   Alignment,
 									  bool						   IsNewStore);
 	void				   Flush();
-	void				   Scrub(ScrubContext& Ctx);
+	void				   ScrubStorage(ScrubContext& Ctx);
 	virtual void		   CollectGarbage(GcContext& GcCtx) override;
 	virtual GcStorageSize  StorageSize() const override { return {.DiskSize = m_BlockStore.TotalSize()}; }
 
diff --git a/src/zenstore/filecas.cpp b/src/zenstore/filecas.cpp
index 4474b52bd..30c6c2d4d 100644
--- a/src/zenstore/filecas.cpp
+++ b/src/zenstore/filecas.cpp
@@ -832,7 +832,7 @@ FileCasStrategy::Flush()
 }
 
 void
-FileCasStrategy::Scrub(ScrubContext& Ctx)
+FileCasStrategy::ScrubStorage(ScrubContext& Ctx)
 {
 	ZEN_ASSERT(m_IsInitialized);
 
diff --git a/src/zenstore/filecas.h b/src/zenstore/filecas.h
index 01d3648da..5dbf820e5 100644
--- a/src/zenstore/filecas.h
+++ b/src/zenstore/filecas.h
@@ -40,7 +40,7 @@ struct FileCasStrategy final : public GcStorage
 	bool				   HaveChunk(const IoHash& ChunkHash);
 	void				   FilterChunks(HashKeySet& InOutChunks);
 	void				   Flush();
-	void				   Scrub(ScrubContext& Ctx);
+	void				   ScrubStorage(ScrubContext& Ctx);
 	virtual void		   CollectGarbage(GcContext& GcCtx) override;
 	virtual GcStorageSize  StorageSize() const override { return {.DiskSize = m_TotalSize.load(std::memory_order::relaxed)}; }
 
diff --git a/src/zenstore/gc.cpp b/src/zenstore/gc.cpp
index 503470bb0..9cbc43b1b 100644
--- a/src/zenstore/gc.cpp
+++ b/src/zenstore/gc.cpp
@@ -657,14 +657,14 @@ GcScheduler::Shutdown()
 }
 
 bool
-GcScheduler::Trigger(const GcScheduler::TriggerParams& Params)
+GcScheduler::TriggerGc(const GcScheduler::TriggerGcParams& Params)
 {
 	if (m_Config.Enabled)
 	{
 		std::unique_lock Lock(m_GcMutex);
 		if (static_cast<uint32_t>(GcSchedulerStatus::kIdle) == m_Status)
 		{
-			m_TriggerParams	   = Params;
+			m_TriggerGcParams  = Params;
 			uint32_t IdleState = static_cast<uint32_t>(GcSchedulerStatus::kIdle);
 			if (m_Status.compare_exchange_strong(IdleState, static_cast<uint32_t>(GcSchedulerStatus::kRunning)))
 			{
@@ -735,10 +735,10 @@ GcScheduler::SchedulerThread()
 		std::chrono::seconds MaxCacheDuration	 = m_Config.MaxCacheDuration;
 		uint64_t			 DiskSizeSoftLimit	 = m_Config.DiskSizeSoftLimit;
 		GcClock::TimePoint	 Now				 = GcClock::Now();
-		if (m_TriggerParams)
+		if (m_TriggerGcParams)
 		{
-			const auto TriggerParams = m_TriggerParams.value();
-			m_TriggerParams.reset();
+			const auto TriggerParams = m_TriggerGcParams.value();
+			m_TriggerGcParams.reset();
 
 			CollectSmallObjects = TriggerParams.CollectSmallObjects;
 			if (TriggerParams.MaxCacheDuration != std::chrono::seconds::max())
diff --git a/src/zenstore/include/zenstore/cidstore.h b/src/zenstore/include/zenstore/cidstore.h
index 16ca78225..ecc7faab0 100644
--- a/src/zenstore/include/zenstore/cidstore.h
+++ b/src/zenstore/include/zenstore/cidstore.h
@@ -75,7 +75,7 @@ public:
 	bool		 ContainsChunk(const IoHash& DecompressedId);
 	void		 FilterChunks(HashKeySet& InOutChunks);
 	void		 Flush();
-	void		 Scrub(ScrubContext& Ctx);
+	void		 ScrubStorage(ScrubContext& Ctx);
 	CidStoreSize TotalSize() const;
 
 private:
diff --git a/src/zenstore/include/zenstore/gc.h b/src/zenstore/include/zenstore/gc.h
index fe9857e6a..0e18315d9 100644
--- a/src/zenstore/include/zenstore/gc.h
+++ b/src/zenstore/include/zenstore/gc.h
@@ -220,14 +220,14 @@ public:
 	void			  Shutdown();
 	GcSchedulerStatus Status() const { return static_cast<GcSchedulerStatus>(m_Status.load()); }
 
-	struct TriggerParams
+	struct TriggerGcParams
 	{
 		bool				 CollectSmallObjects = false;
 		std::chrono::seconds MaxCacheDuration	 = std::chrono::seconds::max();
 		uint64_t			 DiskSizeSoftLimit	 = 0;
 	};
 
-	bool Trigger(const TriggerParams& Params);
+	bool TriggerGc(const TriggerGcParams& Params);
 
 private:
 	void			   SchedulerThread();
@@ -237,18 +237,18 @@ private:
 	virtual bool	   AreDiskWritesAllowed() const override { return !m_AreDiskWritesBlocked.load(); }
 	void			   CheckDiskSpace(const DiskSpace& Space);
 
-	spdlog::logger&				 m_Log;
-	GcManager&					 m_GcManager;
-	GcSchedulerConfig			 m_Config;
-	GcClock::TimePoint			 m_LastGcTime{};
-	GcClock::TimePoint			 m_LastGcExpireTime{};
-	GcClock::TimePoint			 m_NextGcTime{};
-	std::atomic_uint32_t		 m_Status{};
-	std::thread					 m_GcThread;
-	std::mutex					 m_GcMutex;
-	std::condition_variable		 m_GcSignal;
-	std::optional<TriggerParams> m_TriggerParams;
-	std::atomic_bool			 m_AreDiskWritesBlocked = false;
+	spdlog::logger&				   m_Log;
+	GcManager&					   m_GcManager;
+	GcSchedulerConfig			   m_Config;
+	GcClock::TimePoint			   m_LastGcTime{};
+	GcClock::TimePoint			   m_LastGcExpireTime{};
+	GcClock::TimePoint			   m_NextGcTime{};
+	std::atomic_uint32_t		   m_Status{};
+	std::thread					   m_GcThread;
+	std::mutex					   m_GcMutex;
+	std::condition_variable		   m_GcSignal;
+	std::optional<TriggerGcParams> m_TriggerGcParams;
+	std::atomic_bool			   m_AreDiskWritesBlocked = false;
 
 	TCasLogFile<DiskUsageWindow::DiskUsageEntry> m_DiskUsageLog;
 	DiskUsageWindow								 m_DiskUsageWindow;