Don't throw a runtime_error if remote execute api fails

asio currently doesn't propagate the exception as a 500 error

2 files changed, 23 insertions, 9 deletions

diff --git a/zenserver/compute/apply.cpp b/zenserver/compute/apply.cpp
index 1f18b054f..7b4fe39e6 100644
--- a/zenserver/compute/apply.cpp
+++ b/zenserver/compute/apply.cpp
@@ -578,9 +578,13 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
 								if (NeedList.empty())
 								{
 									// We already have everything
+									CbObject		 Output;
+									HttpResponseCode ResponseCode = ExecActionUpstream(Worker, RequestObject, Output);
 
-									CbObject Output = ExecActionUpstream(Worker, RequestObject);
-
+									if (ResponseCode != HttpResponseCode::OK)
+									{
+										return HttpReq.WriteResponse(ResponseCode);
+									}
 									return HttpReq.WriteResponse(HttpResponseCode::OK, Output);
 								}
 
@@ -638,8 +642,13 @@ HttpFunctionService::HttpFunctionService(CasStore& Store, CidStore& InCidStore,
 										  zen::NiceBytes(TotalNewBytes),
 										  NewAttachmentCount);
 
-								CbObject Output = ExecActionUpstream(Worker, ActionObj);
+								CbObject		 Output;
+								HttpResponseCode ResponseCode = ExecActionUpstream(Worker, ActionObj, Output);
 
+								if (ResponseCode != HttpResponseCode::OK)
+								{
+									return HttpReq.WriteResponse(ResponseCode);
+								}
 								return HttpReq.WriteResponse(HttpResponseCode::OK, Output);
 							}
 							break;
@@ -881,8 +890,8 @@ HttpFunctionService::ExecAction(const WorkerDesc& Worker, CbObject Action)
 	return OutputPackage;
 }
 
-CbObject
-HttpFunctionService::ExecActionUpstream(const WorkerDesc& Worker, CbObject Action)
+HttpResponseCode
+HttpFunctionService::ExecActionUpstream(const WorkerDesc& Worker, CbObject Action, CbObject& Object)
 {
 	const IoHash WorkerId = Worker.Descriptor.GetHash();
 	const IoHash ActionId = Action.GetHash();
@@ -896,13 +905,19 @@ HttpFunctionService::ExecActionUpstream(const WorkerDesc& Worker, CbObject Actio
 	if (!EnqueueResult.Success)
 	{
 		throw std::runtime_error("Error enqueuing upstream task");
+		ZEN_ERROR(
+			"Error enqueuing upstream Action {}/{}",
+				  WorkerId.ToHexString(),
+				  ActionId.ToHexString());
+		return HttpResponseCode::InternalServerError;
 	}
 
 	CbObjectWriter Writer;
 	Writer.AddHash("worker", WorkerId);
 	Writer.AddHash("action", ActionId);
 
-	return std::move(Writer.Save());
+	Object = std::move(Writer.Save());
+	return HttpResponseCode::OK;
 }
 
 HttpResponseCode
@@ -932,8 +947,7 @@ HttpFunctionService::ExecActionUpstreamResult(const IoHash& WorkerId, const IoHa
 				  Completed.Error.Reason,
 				  Completed.Error.ErrorCode);
 
-		throw std::runtime_error(
-			"Action {}/{} failed"_format(WorkerId.ToHexString(), ActionId.ToHexString()).c_str());
+		return HttpResponseCode::InternalServerError;
 	}
 
 	ZEN_INFO("Action {}/{} completed with {} attachments ({} compressed, {} uncompressed)",
diff --git a/zenserver/compute/apply.h b/zenserver/compute/apply.h
index 15cda4750..0d6edf119 100644
--- a/zenserver/compute/apply.h
+++ b/zenserver/compute/apply.h
@@ -46,7 +46,7 @@ private:
 
 	[[nodiscard]] std::filesystem::path CreateNewSandbox();
 	[[nodiscard]] CbPackage				ExecAction(const WorkerDesc& Worker, CbObject Action);
-	[[nodiscard]] CbObject				ExecActionUpstream(const WorkerDesc& Worker, CbObject Action);
+	[[nodiscard]] HttpResponseCode		ExecActionUpstream(const WorkerDesc& Worker, CbObject Action, CbObject& Object);
 	[[nodiscard]] HttpResponseCode		ExecActionUpstreamResult(const IoHash& WorkerId, const IoHash& ActionId, CbPackage& Package);
 
 	RwLock								   m_WorkerLock;