Fixed race condition on peer shutdown

mailgun · Dec 18, 2020 · f3cccc2 · f3cccc2
1 parent 9143dd3
commit f3cccc2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/peer_client.go b/peer_client.go
@@ -239,13 +239,16 @@ func (c *PeerClient) getPeerRateLimitsBatch(ctx context.Context, r *RateLimitReq
 		return nil, err
 	}
 
+	// See NOTE above about RLock and wg.Add(1)
+	c.mutex.RLock()
+	if c.status == peerClosing {
+		return nil, &PeerErr{err: errors.New("already disconnecting")}
+	}
 	req := request{request: r, resp: make(chan *response, 1)}
 
 	// Enqueue the request to be sent
 	c.queue <- &req
 
-	// See NOTE above about RLock and wg.Add(1)
-	c.mutex.RLock()
 	c.wg.Add(1)
 	defer func() {
 		c.mutex.RUnlock()

diff --git a/version b/version
@@ -1 +1 @@
-1.0.0-rc.3
+1.0.0-rc.4