Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(common): preserve ErrorInfo on retry errors #9971

Merged
merged 1 commit into from
Oct 3, 2022
Merged

fix(common): preserve ErrorInfo on retry errors #9971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions google/cloud/internal/retry_loop_helpers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
namespace internal {

Status RetryLoopError(char const* loop_message, char const* location,
Status const& last_status) {
Status const& status) {
std::ostringstream os;
os << loop_message << " " << location << ": " << last_status.message();
return Status(last_status.code(), std::move(os).str());
os << loop_message << " " << location << ": " << status.message();
return Status(status.code(), std::move(os).str(), status.error_info());
}

} // namespace internal
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/internal/retry_loop_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Status GetResultStatus(StatusOr<T> result) {

/// Generate an error Status for `RetryLoop()` and `AsyncRetryLoop()`
Status RetryLoopError(char const* loop_message, char const* location,
Status const& last_status);
Status const& status);

} // namespace internal
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
Expand Down
7 changes: 6 additions & 1 deletion google/cloud/internal/retry_loop_helpers_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,16 @@ TEST(RetryLoopHelpersTest, IncludeErrorInfo) {
auto const code = StatusCode::kFailedPrecondition;
auto const message = std::string{
"At least one of the pre-conditions you specified did not hold."};
auto input = Status(code, message);
auto const error_info = ErrorInfo("conditionNotMet", "global",
{{"locationType", "header"},
{"location", "If-Match"},
{"http_status_code", "412"}});
auto input = Status(code, message, error_info);
auto actual = RetryLoopError("permanent error", "SomeFunction", input);
EXPECT_THAT(actual, StatusIs(code, HasSubstr(message)));
EXPECT_THAT(actual.message(), HasSubstr("permanent error"));
EXPECT_THAT(actual.message(), HasSubstr("SomeFunction"));
EXPECT_EQ(actual.error_info(), error_info);
}

} // namespace
Expand Down