[FAB-2529] Gossip Conn store - thread safety bug

When the gossip comm layer is shutdown, the connection store is also shutdown as a result. While a connection is deleted/added, and the conn store is shutdown at the same time- a concurrent map read-write occures. Change-Id: I6ea84b3fb7e49a616a76d9cc0608a48dacb43bac Signed-off-by: Yacov Manevich <[email protected]>
hyperledger · Mar 1, 2017 · d8d3d92 · d8d3d92
1 parent 3eaccbd
commit d8d3d92
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/gossip/comm/conn.go b/gossip/comm/conn.go
@@ -89,7 +89,10 @@ func (cs *connectionStore) getConnection(peer *RemotePeer) (*connection, error)
 
 	destinationLock.Unlock()
 
-	if cs.isClosing {
+	cs.RLock()
+	isClosing = cs.isClosing
+	cs.RUnlock()
+	if isClosing {
 		return nil, errors.New("ConnStore is closing")
 	}
 
@@ -141,10 +144,15 @@ func (cs *connectionStore) shutdown() {
 	cs.Lock()
 	cs.isClosing = true
 	pkiIds2conn := cs.pki2Conn
+
+	var connections2Close []*connection
+	for _, conn := range pkiIds2conn {
+		connections2Close = append(connections2Close, conn)
+	}
 	cs.Unlock()
 
 	wg := sync.WaitGroup{}
-	for _, conn := range pkiIds2conn {
+	for _, conn := range connections2Close {
 		wg.Add(1)
 		go func(conn *connection) {
 			cs.closeByPKIid(conn.pkiID)