[FAB-1447] Broadcaster exits normally at EOF

Make broadcast.(*broadcaster).queueEnvelopes() exits normally when it detects io.EOF at receiving a message from a client. If the orderer forwards io.EOF to a Node SDK client, Orderer.sendBroadcast() fails due to the error. I observed this error when I deploy a large chaincode with BATCHSIZE=1. Fix Issue # FAB-1447. https://jira.hyperledger.org/browse/FAB-1447 Signed-off-by: Tatsushi Inagaki <[email protected]> Change-Id: Icc6379bb04ceaab7ad463c0234d2419c34f8faca
hyperledger · Dec 28, 2016 · 4804471 · 4804471
1 parent b48f46d
commit 4804471
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/orderer/common/broadcast/broadcast.go b/orderer/common/broadcast/broadcast.go
@@ -22,6 +22,8 @@ import (
 	ab "github.com/hyperledger/fabric/protos/orderer"
 	"github.com/op/go-logging"
 
+	"io"
+
 	"github.com/golang/protobuf/proto"
 )
 
@@ -118,6 +120,9 @@ func (b *broadcaster) queueEnvelopes(srv ab.AtomicBroadcast_BroadcastServer) err
 		default:
 		}
 		msg, err := srv.Recv()
+		if err == io.EOF {
+			return nil
+		}
 		if err != nil {
 			return err
 		}