Merge pull request #19709 from vespa-engine/toregge/fix-merge-status-check-delayed-error

Fix MergeStatus::check_delayed_error: Empty fail message is not an error.

1 files changed, 3 insertions, 1 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/mergestatus.cpp b/storage/src/vespa/storage/persistence/filestorage/mergestatus.cpp
index 1d9e0c6fae6..a75eda5b1a4 100644
--- a/storage/src/vespa/storage/persistence/filestorage/mergestatus.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/mergestatus.cpp
@@ -138,7 +138,9 @@ MergeStatus::check_delayed_error(api::ReturnCode &return_code)
         future_error.wait();
         vespalib::string fail_message = future_error.get();
         delayed_error.reset();
-        return_code = api::ReturnCode(api::ReturnCode::INTERNAL_FAILURE, std::move(fail_message));
+        if (!fail_message.empty()) {
+            return_code = api::ReturnCode(api::ReturnCode::INTERNAL_FAILURE, std::move(fail_message));
+        }
     }
 }