gc stop command (#569)v0.2.36-pre2

- Feature: New endpoint `/admin/gc-stop` to cancel a running garbage collect operation
- Feature: Added `zen gc-stop` command to cancel a running garbage collect operation
- Bugfix: GCv2 - make sure to discover all projects and oplogs before checking for expired data

3 files changed, 37 insertions, 6 deletions

diff --git a/src/zenserver/admin/admin.cpp b/src/zenserver/admin/admin.cpp
index f1d9f8d7c..1d5463a32 100644
--- a/src/zenserver/admin/admin.cpp
+++ b/src/zenserver/admin/admin.cpp
@@ -346,7 +346,19 @@ HttpAdminService::HttpAdminService(GcScheduler&	   Scheduler,
 
 			CbObjectWriter Response;
 			Response << "Status"sv << (Started ? "Started"sv : "Running"sv);
-			HttpReq.WriteResponse(HttpResponseCode::OK, Response.Save());
+			HttpReq.WriteResponse(HttpResponseCode::Accepted, Response.Save());
+		},
+		HttpVerb::kPost);
+
+	m_Router.RegisterRoute(
+		"gc-stop",
+		[this](HttpRouterRequest& Req) {
+			HttpServerRequest& HttpReq = Req.ServerRequest();
+			if (m_GcScheduler.CancelGC())
+			{
+				return HttpReq.WriteResponse(HttpResponseCode::Accepted);
+			}
+			HttpReq.WriteResponse(HttpResponseCode::OK);
 		},
 		HttpVerb::kPost);
 
diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 21aa6b44a..200aba3a9 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -3184,6 +3184,8 @@ ProjectStore::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
 	std::vector<Ref<Project>> ExpiredProjects;
 	std::vector<Ref<Project>> Projects;
 
+	DiscoverProjects();
+
 	{
 		RwLock::SharedLockScope Lock(m_ProjectsLock);
 		for (auto& Kv : m_Projects)
@@ -3197,13 +3199,30 @@ ProjectStore::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
 		}
 	}
 
+	for (const Ref<Project>& Project : Projects)
+	{
+		std::vector<std::string> OpLogs = Project->ScanForOplogs();
+		for (const std::string& OpLogId : OpLogs)
+		{
+			Project->OpenOplog(OpLogId);
+			if (Ctx.IsCancelledFlag)
+			{
+				return nullptr;
+			}
+		}
+	}
+
 	size_t OplogCount		 = 0;
 	size_t ExpiredOplogCount = 0;
 	for (const Ref<Project>& Project : Projects)
 	{
+		if (Ctx.IsCancelledFlag)
+		{
+			break;
+		}
+
 		std::vector<std::string> ExpiredOplogs;
 		{
-			RwLock::ExclusiveLockScope __(m_ProjectsLock);
 			Project->IterateOplogs(
 				[&Ctx, &Project, &ExpiredOplogs, &OplogCount](const RwLock::SharedLockScope& Lock, ProjectStore::Oplog& Oplog) {
 					OplogCount++;
@@ -3233,7 +3252,7 @@ ProjectStore::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
 
 	Stats.CheckedCount += ProjectCount + OplogCount;
 
-	if (ExpiredProjects.empty())
+	if (ExpiredProjects.empty() && ExpiredOplogCount == 0)
 	{
 		ZEN_DEBUG("GCV2: projectstore [REMOVE EXPIRED] '{}': no expired projects found", m_ProjectBasePath);
 		return nullptr;
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index ba9ff4f88..841f19295 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -604,8 +604,6 @@ ZenServer::Run()
 	SetNewState(kShuttingDown);
 
 	ZEN_INFO(ZEN_APP_NAME " exiting");
-
-	Flush();
 }
 
 void
@@ -640,8 +638,10 @@ ZenServer::Cleanup()
 		}
 
 		m_StatsReporter.Shutdown();
-
 		m_GcScheduler.Shutdown();
+
+		Flush();
+
 		m_AdminService.reset();
 		m_VfsService.reset();
 		m_ObjStoreService.reset();