Indicate error to client in DoPut if no message sent

kszucs · Feb 5, 2019 · f32c0b2 · f32c0b2
1 parent cd56782
commit f32c0b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/cpp/src/arrow/flight/client.cc b/cpp/src/arrow/flight/client.cc
@@ -133,8 +133,10 @@ class FlightPutWriter::FlightPutWriterImpl : public ipc::RecordBatchWriter {
     // may invoke through vtable (not updated by reinterpret_cast)
     if (!custom_writer->grpc::ClientWriter<IpcPayload>::Write(payload,
                                                               grpc::WriteOptions())) {
-      // Stream ended?
-      return Status::UnknownError("Could not write record batch to stream");
+      std::stringstream ss;
+      ss << "Could not write record batch to stream: "
+         << rpc_->context.debug_error_string();
+      return Status::IOError(ss.str());
     }
     return Status::OK();
   }
@@ -313,7 +315,10 @@ class FlightClient::FlightClientImpl {
     descriptor_message.set_data_header(header_buf->ToString());
 
     if (!write_stream->Write(descriptor_message, grpc::WriteOptions())) {
-      return Status::UnknownError("Could not write initial message to stream");
+      std::stringstream ss;
+      ss << "Could not write descriptor and schema to stream: "
+         << rpc->context.debug_error_string();
+      return Status::IOError(ss.str());
     }
 
     out->set_stream(std::move(write_stream));

diff --git a/cpp/src/arrow/flight/server.cc b/cpp/src/arrow/flight/server.cc
@@ -234,7 +234,9 @@ class FlightServiceImpl : public FlightService::Service {
         return internal::ToGrpcStatus(server_->DoPut(std::move(message_reader)));
       }
     } else {
-      return grpc::Status::OK;
+      return internal::ToGrpcStatus(
+          Status(StatusCode::Invalid,
+                 "Client provided malformed message or did not provide message"));
     }
   }