cckellogg commented on a change in pull request #622:
URL: https://github.com/apache/pulsar-client-go/pull/622#discussion_r717609360
##########
File path: pulsar/internal/connection.go
##########
@@ -752,38 +752,51 @@ func (c *connection) handleAuthChallenge(authChallenge
*pb.CommandAuthChallenge)
c.writeCommand(baseCommand(pb.BaseCommand_AUTH_RESPONSE,
cmdAuthResponse))
}
-func (c *connection) handleSendError(cmdError *pb.CommandError) {
- c.log.Warnf("Received send error from server: [%v] : [%s]",
cmdError.GetError(), cmdError.GetMessage())
+func (c *connection) handleSendError(sendError *pb.CommandSendError) {
+ c.log.Warnf("Received send error from server: [%v] : [%s]",
sendError.GetError(), sendError.GetMessage())
- requestID := cmdError.GetRequestId()
+ producerID := sendError.GetProducerId()
- switch cmdError.GetError() {
+ c.listenersLock.RLock()
+ producerListener := c.listeners[producerID]
+ c.listenersLock.RUnlock()
+
+ switch sendError.GetError() {
case pb.ServerError_NotAllowedError:
- request, ok := c.deletePendingRequest(requestID)
+ _, ok := c.deletePendingProducers(producerID)
if !ok {
c.log.Warnf("Received unexpected error response for
request %d of type %s",
- requestID, cmdError.GetError())
+ producerID, sendError.GetError())
return
}
- errMsg := fmt.Sprintf("server error: %s: %s",
cmdError.GetError(), cmdError.GetMessage())
- request.callback(nil, errors.New(errMsg))
+ c.log.Warnf("server error: %s: %s", sendError.GetError(),
sendError.GetMessage())
case pb.ServerError_TopicTerminatedError:
- request, ok := c.deletePendingRequest(requestID)
+ _, ok := c.deletePendingProducers(producerID)
Review comment:
I thought all commands sent to the broker will have a request id? Do we
still need to clean those up from the the pending request queue?
##########
File path: pulsar/internal/connection.go
##########
@@ -752,38 +752,51 @@ func (c *connection) handleAuthChallenge(authChallenge
*pb.CommandAuthChallenge)
c.writeCommand(baseCommand(pb.BaseCommand_AUTH_RESPONSE,
cmdAuthResponse))
}
-func (c *connection) handleSendError(cmdError *pb.CommandError) {
- c.log.Warnf("Received send error from server: [%v] : [%s]",
cmdError.GetError(), cmdError.GetMessage())
+func (c *connection) handleSendError(sendError *pb.CommandSendError) {
+ c.log.Warnf("Received send error from server: [%v] : [%s]",
sendError.GetError(), sendError.GetMessage())
- requestID := cmdError.GetRequestId()
+ producerID := sendError.GetProducerId()
- switch cmdError.GetError() {
+ c.listenersLock.RLock()
+ producerListener := c.listeners[producerID]
+ c.listenersLock.RUnlock()
+
+ switch sendError.GetError() {
case pb.ServerError_NotAllowedError:
- request, ok := c.deletePendingRequest(requestID)
+ _, ok := c.deletePendingProducers(producerID)
if !ok {
c.log.Warnf("Received unexpected error response for
request %d of type %s",
- requestID, cmdError.GetError())
+ producerID, sendError.GetError())
return
}
- errMsg := fmt.Sprintf("server error: %s: %s",
cmdError.GetError(), cmdError.GetMessage())
- request.callback(nil, errors.New(errMsg))
+ c.log.Warnf("server error: %s: %s", sendError.GetError(),
sendError.GetMessage())
case pb.ServerError_TopicTerminatedError:
- request, ok := c.deletePendingRequest(requestID)
+ _, ok := c.deletePendingProducers(producerID)
if !ok {
- c.log.Warnf("Received unexpected error response for
request %d of type %s",
- requestID, cmdError.GetError())
+ c.log.Warnf("Received unexpected error response for
producer %d of type %s",
+ producerID, sendError.GetError())
return
}
- errMsg := fmt.Sprintf("server error: %s: %s",
cmdError.GetError(), cmdError.GetMessage())
- request.callback(nil, errors.New(errMsg))
+ c.log.Warnf("server error: %s: %s", sendError.GetError(),
sendError.GetMessage())
default:
// By default, for transient error, let the reconnection logic
// to take place and re-establish the produce again
- c.Close()
Review comment:
Why don't we need to close the connection here anymore?
##########
File path: pulsar/internal/connection.go
##########
@@ -752,38 +752,51 @@ func (c *connection) handleAuthChallenge(authChallenge
*pb.CommandAuthChallenge)
c.writeCommand(baseCommand(pb.BaseCommand_AUTH_RESPONSE,
cmdAuthResponse))
}
-func (c *connection) handleSendError(cmdError *pb.CommandError) {
- c.log.Warnf("Received send error from server: [%v] : [%s]",
cmdError.GetError(), cmdError.GetMessage())
+func (c *connection) handleSendError(sendError *pb.CommandSendError) {
+ c.log.Warnf("Received send error from server: [%v] : [%s]",
sendError.GetError(), sendError.GetMessage())
- requestID := cmdError.GetRequestId()
+ producerID := sendError.GetProducerId()
- switch cmdError.GetError() {
+ c.listenersLock.RLock()
+ producerListener := c.listeners[producerID]
+ c.listenersLock.RUnlock()
+
+ switch sendError.GetError() {
case pb.ServerError_NotAllowedError:
- request, ok := c.deletePendingRequest(requestID)
+ _, ok := c.deletePendingProducers(producerID)
if !ok {
c.log.Warnf("Received unexpected error response for
request %d of type %s",
- requestID, cmdError.GetError())
+ producerID, sendError.GetError())
return
}
- errMsg := fmt.Sprintf("server error: %s: %s",
cmdError.GetError(), cmdError.GetMessage())
- request.callback(nil, errors.New(errMsg))
+ c.log.Warnf("server error: %s: %s", sendError.GetError(),
sendError.GetMessage())
case pb.ServerError_TopicTerminatedError:
- request, ok := c.deletePendingRequest(requestID)
+ _, ok := c.deletePendingProducers(producerID)
Review comment:
I see. The thing I'm still confused about is. Each request sent on the
connection can get added into the pending request map right?
https://github.com/apache/pulsar-client-go/blob/master/pulsar/internal/connection.go#L620
```
func (c *connection) internalSendRequest(req *request) {
if c.closed() {
c.log.Warnf("internalSendRequest failed for connectionClosed")
if req.callback != nil {
req.callback(req.cmd, ErrConnectionClosed)
}
} else {
c.pendingLock.Lock()
if req.id != nil {
c.pendingReqs[*req.id] = req
}
c.pendingLock.Unlock()
c.writeCommand(req.cmd)
}
}
```
If a command is sent and gets added to the pending requests map and then we
get this response from the broker `pb.ServerError_TopicTerminatedError` will we
end up leaving/leaking commands in the pending requests map? If there is no
request id maybe it can't be avoided. Am I missing something?
##########
File path: pulsar/internal/connection.go
##########
@@ -752,38 +752,51 @@ func (c *connection) handleAuthChallenge(authChallenge
*pb.CommandAuthChallenge)
c.writeCommand(baseCommand(pb.BaseCommand_AUTH_RESPONSE,
cmdAuthResponse))
}
-func (c *connection) handleSendError(cmdError *pb.CommandError) {
- c.log.Warnf("Received send error from server: [%v] : [%s]",
cmdError.GetError(), cmdError.GetMessage())
+func (c *connection) handleSendError(sendError *pb.CommandSendError) {
+ c.log.Warnf("Received send error from server: [%v] : [%s]",
sendError.GetError(), sendError.GetMessage())
- requestID := cmdError.GetRequestId()
+ producerID := sendError.GetProducerId()
- switch cmdError.GetError() {
+ c.listenersLock.RLock()
+ producerListener := c.listeners[producerID]
+ c.listenersLock.RUnlock()
+
+ switch sendError.GetError() {
case pb.ServerError_NotAllowedError:
- request, ok := c.deletePendingRequest(requestID)
+ _, ok := c.deletePendingProducers(producerID)
if !ok {
c.log.Warnf("Received unexpected error response for
request %d of type %s",
- requestID, cmdError.GetError())
+ producerID, sendError.GetError())
return
}
- errMsg := fmt.Sprintf("server error: %s: %s",
cmdError.GetError(), cmdError.GetMessage())
- request.callback(nil, errors.New(errMsg))
Review comment:
Does the producer still need to be notified somehow?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
