safer gcv2 on error (#60)

- Bugfix: Harden GCv2 when errors occur and gracefully abort GC operation on error

1 files changed, 13 insertions, 4 deletions

diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 27e8b2463..874715818 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -3683,7 +3683,7 @@ public:
 	{
 	}
 
-	virtual void CompactStore(GcCtx& Ctx, GcCompactStoreStats& Stats, const std::function<uint64_t()>&)
+	virtual void CompactStore(GcCtx& Ctx, GcCompactStoreStats& Stats, const std::function<uint64_t()>&) override
 	{
 		ZEN_TRACE_CPU("Store::CompactStore");
 
@@ -3747,6 +3747,8 @@ public:
 		m_OplogPathsToRemove.clear();
 	}
 
+	virtual std::string GetGcName(GcCtx&) override { return fmt::format("projectstore: '{}'", m_BasePath.string()); }
+
 private:
 	std::filesystem::path			   m_BasePath;
 	std::vector<std::filesystem::path> m_OplogPathsToRemove;
@@ -3902,10 +3904,17 @@ public:
 
 	virtual ~ProjectStoreReferenceChecker()
 	{
-		m_OplogLock.reset();
-		if (m_OplogCaptureEnabled)
+		try
+		{
+			m_OplogLock.reset();
+			if (m_OplogCaptureEnabled)
+			{
+				m_Oplog.DisableUpdateCapture();
+			}
+		}
+		catch (const std::exception& Ex)
 		{
-			m_Oplog.DisableUpdateCapture();
+			ZEN_ERROR("~ProjectStoreReferenceChecker threw exception: '{}'", Ex.what());
 		}
 	}