diff options
author | Tor Egge <Tor.Egge@online.no> | 2021-10-22 23:22:59 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2021-10-22 23:22:59 +0200 |
commit | 5ec683c43ecf668891a9ef782f816ded59739257 (patch) | |
tree | 8b296bee3210f114c64254b2e8299bed86efd4b7 | |
parent | 5d17da853b36dd4d2798195de709438725e6351c (diff) |
Fix MergeStatus::check_delayed_error: Empty fail message is not an error.
-rw-r--r-- | storage/src/vespa/storage/persistence/filestorage/mergestatus.cpp | 4 |
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)); + } } } |