Improvement: Add names to background jobs for easier debugging (#412)

Improvement: Background jobs now temporarily sets thread name to background job name while executing
Improvement: Background jobs tracks worker thread id used while executing

1 files changed, 27 insertions, 17 deletions

diff --git a/src/zenserver/projectstore/remoteprojectstore.cpp b/src/zenserver/projectstore/remoteprojectstore.cpp
index ea744eb35..ee3456ecc 100644
--- a/src/zenserver/projectstore/remoteprojectstore.cpp
+++ b/src/zenserver/projectstore/remoteprojectstore.cpp
@@ -77,7 +77,7 @@ ReportProgress(JobContext* OptionalContext, std::string_view CurrentOp, ptrdiff_
 	if (OptionalContext)
 	{
 		ZEN_ASSERT(Total > 0);
-		OptionalContext->Queue.ReportProgress(OptionalContext->Id, CurrentOp, gsl::narrow<uint32_t>((100 * (Total - Remaining)) / Total));
+		OptionalContext->ReportProgress(CurrentOp, gsl::narrow<uint32_t>((100 * (Total - Remaining)) / Total));
 	}
 	ZEN_INFO("{}", CurrentOp);
 }
@@ -87,12 +87,22 @@ ReportMessage(JobContext* OptionalContext, std::string_view Message)
 {
 	if (OptionalContext)
 	{
-		OptionalContext->Queue.ReportMessage(OptionalContext->Id, Message);
+		OptionalContext->ReportMessage(Message);
 	}
 	ZEN_INFO("{}", Message);
 }
 
 bool
+IsCancelled(JobContext* OptionalContext)
+{
+	if (!OptionalContext)
+	{
+		return false;
+	}
+	return OptionalContext->IsCancelled();
+}
+
+bool
 IterateBlock(IoBuffer&& CompressedBlock, std::function<void(CompressedBuffer&& Chunk, const IoHash& AttachmentHash)> Visitor)
 {
 	IoBuffer BlockPayload = CompressedBuffer::FromCompressedNoValidate(std::move(CompressedBlock)).Decompress().AsIoBuffer();
@@ -408,13 +418,13 @@ BuildContainer(CidStore&																	ChunkStore,
 				SectionOpsWriter << Op;
 			}
 			OpCount++;
-			if (OptionalContext && OptionalContext->CancelFlag)
+			if (IsCancelled(OptionalContext))
 			{
 				RemoteResult.SetError(gsl::narrow<int>(HttpResponseCode::OK), "Operation cancelled", "");
 			}
 		});
 
-		if (OptionalContext && OptionalContext->CancelFlag)
+		if (IsCancelled(OptionalContext))
 		{
 			RemoteResult.SetError(gsl::narrow<int>(HttpResponseCode::OK), "Operation cancelled", "");
 			return {};
@@ -493,7 +503,7 @@ BuildContainer(CidStore&																	ChunkStore,
 			return LhsKeyIt->second < RhsKeyIt->second;
 		});
 
-		if (OptionalContext && OptionalContext->CancelFlag)
+		if (IsCancelled(OptionalContext))
 		{
 			RemoteResult.SetError(gsl::narrow<int>(HttpResponseCode::OK), "Operation cancelled", "");
 			return {};
@@ -522,7 +532,7 @@ BuildContainer(CidStore&																	ChunkStore,
 		Latch BlockCreateLatch(1);
 		for (const IoHash& AttachmentHash : SortedAttachments)
 		{
-			if (OptionalContext && OptionalContext->CancelFlag)
+			if (IsCancelled(OptionalContext))
 			{
 				RemoteResult.SetError(gsl::narrow<int>(HttpResponseCode::OK), "Operation cancelled", "");
 				BlockCreateLatch.CountDown();
@@ -652,7 +662,7 @@ BuildContainer(CidStore&																	ChunkStore,
 		}
 		SectionOpsWriter.EndArray();  // "ops"
 
-		if (OptionalContext && OptionalContext->CancelFlag)
+		if (IsCancelled(OptionalContext))
 		{
 			RemoteResult.SetError(gsl::narrow<int>(HttpResponseCode::OK), "Operation cancelled", "");
 			BlockCreateLatch.CountDown();
@@ -670,7 +680,7 @@ BuildContainer(CidStore&																	ChunkStore,
 								  LargeAttachmentCount));
 
 		CompressedBuffer CompressedOpsSection = CompressedBuffer::Compress(SectionOpsWriter.Save().GetBuffer());
-		if (OptionalContext && OptionalContext->CancelFlag)
+		if (IsCancelled(OptionalContext))
 		{
 			RemoteResult.SetError(gsl::narrow<int>(HttpResponseCode::OK), "Operation cancelled", "");
 			BlockCreateLatch.CountDown();
@@ -694,7 +704,7 @@ BuildContainer(CidStore&																	ChunkStore,
 		while (!BlockCreateLatch.Wait(1000))
 		{
 			ptrdiff_t Remaining = BlockCreateLatch.Remaining();
-			if (OptionalContext && OptionalContext->CancelFlag)
+			if (IsCancelled(OptionalContext))
 			{
 				RemoteResult.SetError(gsl::narrow<int>(HttpResponseCode::OK), "Operation cancelled", "");
 				while (!BlockCreateLatch.Wait(1000))
@@ -896,7 +906,7 @@ UploadAttachments(WorkerThreadPool&											  WorkerPool,
 		return;
 	}
 
-	if (OptionalContext && OptionalContext->CancelFlag)
+	if (IsCancelled(OptionalContext))
 	{
 		if (!RemoteResult.IsError())
 		{
@@ -978,7 +988,7 @@ UploadAttachments(WorkerThreadPool&											  WorkerPool,
 			});
 	}
 
-	if (OptionalContext && OptionalContext->CancelFlag)
+	if (IsCancelled(OptionalContext))
 	{
 		if (!RemoteResult.IsError())
 		{
@@ -1029,7 +1039,7 @@ UploadAttachments(WorkerThreadPool&											  WorkerPool,
 		});
 	}
 
-	if (OptionalContext && OptionalContext->CancelFlag)
+	if (IsCancelled(OptionalContext))
 	{
 		if (!RemoteResult.IsError())
 		{
@@ -1105,7 +1115,7 @@ UploadAttachments(WorkerThreadPool&											  WorkerPool,
 	while (!SaveAttachmentsLatch.Wait(1000))
 	{
 		ptrdiff_t Remaining = SaveAttachmentsLatch.Remaining();
-		if (OptionalContext && OptionalContext->CancelFlag)
+		if (IsCancelled(OptionalContext))
 		{
 			if (!RemoteResult.IsError())
 			{
@@ -1304,7 +1314,7 @@ SaveOplog(CidStore&				 ChunkStore,
 												   /* out */ RemoteResult);
 	if (!RemoteResult.IsError())
 	{
-		if (OptionalContext && OptionalContext->CancelFlag)
+		if (IsCancelled(OptionalContext))
 		{
 			RemoteProjectStore::Result Result = {.ErrorCode		 = 0,
 												 .ElapsedSeconds = Timer.GetElapsedTimeMs() / 1000.500,
@@ -1341,7 +1351,7 @@ SaveOplog(CidStore&				 ChunkStore,
 
 		while (!RemoteResult.IsError())
 		{
-			if (OptionalContext && OptionalContext->CancelFlag)
+			if (IsCancelled(OptionalContext))
 			{
 				RemoteProjectStore::Result Result = {.ErrorCode		 = 0,
 													 .ElapsedSeconds = Timer.GetElapsedTimeMs() / 1000.500,
@@ -1365,7 +1375,7 @@ SaveOplog(CidStore&				 ChunkStore,
 				break;
 			}
 
-			if (OptionalContext && OptionalContext->CancelFlag)
+			if (IsCancelled(OptionalContext))
 			{
 				RemoteProjectStore::Result Result = {.ErrorCode		 = 0,
 													 .ElapsedSeconds = Timer.GetElapsedTimeMs() / 1000.500,
@@ -1654,7 +1664,7 @@ LoadOplog(CidStore&			   ChunkStore,
 	while (!AttachmentsWorkLatch.Wait(1000))
 	{
 		ptrdiff_t Remaining = AttachmentsWorkLatch.Remaining();
-		if (OptionalContext && OptionalContext->CancelFlag)
+		if (IsCancelled(OptionalContext))
 		{
 			if (!RemoteResult.IsError())
 			{