throw TErrorResponse instead of TTransportError

commit_hash:c4f32aac4b251cfb981bc2549522fa92881ae370

1 files changed, 8 insertions, 4 deletions

diff --git a/yt/cpp/mapreduce/http/http.cpp b/yt/cpp/mapreduce/http/http.cpp
index 79a172a0417..8137f5a8212 100644
--- a/yt/cpp/mapreduce/http/http.cpp
+++ b/yt/cpp/mapreduce/http/http.cpp
@@ -42,7 +42,7 @@ std::exception_ptr WrapSystemError(
     const std::exception& ex)
 {
     if (auto errorResponse = dynamic_cast<const TErrorResponse*>(&ex); errorResponse != nullptr) {
-        return std::make_exception_ptr(errorResponse);
+        return std::make_exception_ptr(*errorResponse);
     }
 
     auto message = NYT::Format("Request %qv to %qv failed", context.RequestId, context.HostName + context.Method);
@@ -51,7 +51,7 @@ std::exception_ptr WrapSystemError(
         {"host", context.HostName},
         {"method", context.Method},
     });
-    TTransportError errorResponse(std::move(outer));
+    TErrorResponse errorResponse(std::move(outer), context.RequestId);
 
     return std::make_exception_ptr(errorResponse);
 }
@@ -125,8 +125,12 @@ private:
         Y_ABORT_UNLESS(WriteError_ != nullptr);
         try {
             HttpRequest_->GetResponseStream();
-        } catch (const TErrorResponse &) {
-            throw;
+        } catch (const TErrorResponse& e) {
+            // If we can read more meaningful error, we'll throw that error.
+            // If we can't read such error, we'll rethrow original WriteError_ below.
+            if (!e.IsTransportError()) {
+                throw;
+            }
         } catch (...) {
         }
         std::rethrow_exception(WriteError_);