From 98ba64c9cd9e8f3d735d626d0b6ea8f1c34e0ea4 Mon Sep 17 00:00:00 2001
From: Diego Nehab <1635557+diegonehab@users.noreply.github.com>
Date: Fri, 30 Aug 2024 16:32:05 +0100
Subject: [PATCH] feat: explain taint reason before bailing out

---
 CHANGELOG.md           |  3 +++
 src/server-manager.cpp | 12 ++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f05af33..ccd35d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Improved messages when there is a timeout
+- Improved messages when session is tainted
 
 ## [0.9.1] - 2024-03-28
 ### Changed
diff --git a/src/server-manager.cpp b/src/server-manager.cpp
index 7c0247e..5e90438 100644
--- a/src/server-manager.cpp
+++ b/src/server-manager.cpp
@@ -836,7 +836,8 @@ static handler_type::pull_type *new_FinishEpoch_handler(handler_context &hctx) {
             session.session_lock_reason = new_lock_reason;
             // If session is tainted, report potential data loss
             if (session.tainted) {
-                THROW((finish_error_yield_none{grpc::StatusCode::DATA_LOSS, "session is tainted"}));
+                THROW((finish_error_yield_none{grpc::StatusCode::DATA_LOSS,
+                    "session was previously tainted ("s + session.taint_status.error_message() + ")"}));
             }
             auto &epochs = session.epochs;
             // If epoch is unknown, a bail out
@@ -2744,7 +2745,8 @@ static handler_type::pull_type *new_AdvanceState_handler(handler_context &hctx)
             session.session_lock_reason = new_lock_reason;
             // If session is tainted, report potential data loss
             if (session.tainted) {
-                THROW((finish_error_yield_none{grpc::StatusCode::DATA_LOSS, "session is tainted"}));
+                THROW((finish_error_yield_none{grpc::StatusCode::DATA_LOSS,
+                    "session was previously tainted ("s + session.taint_status.error_message() + ")"}));
             }
             // If active epoch does not match expected, bail out
             if (session.active_epoch_index != advance_state_request.active_epoch_index()) {
@@ -2944,7 +2946,8 @@ static handler_type::pull_type *new_InspectState_handler(handler_context &hctx)
             session.session_lock_reason = new_lock_reason;
             // If session is tainted, report potential data loss
             if (session.tainted) {
-                THROW((finish_error_yield_none{grpc::StatusCode::DATA_LOSS, "session is tainted"}));
+                THROW((finish_error_yield_none{grpc::StatusCode::DATA_LOSS,
+                    "session was previously tainted ("s + session.taint_status.error_message() + ")"}));
             }
             // We should be able to find the active epoch, otherwise bail
             auto &epochs = session.epochs;
@@ -2978,7 +2981,8 @@ static handler_type::pull_type *new_InspectState_handler(handler_context &hctx)
             }
             // There is a chance the session was tainted between our yielding and being resumed
             if (session.tainted) {
-                THROW((finish_error_yield_none{grpc::StatusCode::DATA_LOSS, "session is tainted"}));
+                THROW((finish_error_yield_none{grpc::StatusCode::DATA_LOSS,
+                    "session is tainted ("s + session.taint_status.error_message() + ")"}));
             }
             async_context actx{session, request_context, hctx.completion_queue.get(), self, yield};
             process_pending_query(hctx, actx, e);