Skip to content

Commit 7f4f3f0

Browse files
committed
Fix error processing in single node client
1 parent 35033b8 commit 7f4f3f0

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

client/single_node_client.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ func (c *defaultSingleNodeClient) readResponseInto(reader *bytes.Buffer, m proto
220220
responseHeader := &ybApi.ResponseHeader{}
221221
protoErr := utils.DeserializeProto(responseHeaderBuf, responseHeader)
222222
if protoErr != nil {
223-
opLogger.Error("failed unmarshalling response header", "reason", err)
223+
opLogger.Error("failed unmarshalling response header", "reason", protoErr)
224224
return &errors.ReceiveError{
225-
Cause: fmt.Errorf("response header unprocessable: %s", err.Error()),
225+
Cause: fmt.Errorf("response header unprocessable: %s", protoErr.Error()),
226226
}
227227
}
228228

@@ -271,12 +271,13 @@ func (c *defaultSingleNodeClient) readResponseInto(reader *bytes.Buffer, m proto
271271
for {
272272
buf, err := c.recv()
273273
if err != nil {
274-
opLogger.Error("response payload read bytes count != expected count",
274+
opLogger.Error("response payload read error",
275275
"expected-payload-length", responsePayloadLength,
276-
"read-payload-length", n)
276+
"read-payload-length", n,
277+
"reason", err)
277278
return &errors.ReceiveError{
278-
Cause: fmt.Errorf("response payload incomplete: read %d bytes vs expected %d",
279-
n, responsePayloadLength),
279+
Cause: fmt.Errorf("response payload read error: read %d bytes vs expected %d, reason: %s",
280+
n, responsePayloadLength, err.Error()),
280281
}
281282
}
282283

0 commit comments

Comments
 (0)