gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-15 08:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #492 from openziti/fix-xgress-close-deadlock

Browse Source 
Fix close stall by moving notify after seq close
This commit is contained in:
Paul Lorenz
2021-01-27 16:24:03 -05:00
committed by GitHub
parent 5113833088 92024b0d10
commit 4e365ac62d
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
router/xgress_edge/fabric.go
+12 -9
View File
@@ -187,15 +187,7 @@ func (conn *edgeXgressConn) close(notify bool, reason string) {
}
log := pfxlog.ContextLogger(conn.Channel.Label()).WithField("connId", conn.Id())
log.Debugf("closing message sink, reason: %v", reason)
if notify && !conn.IsClosed() {
// Notify edge client of close
log.Debug("sending closed to SDK client")
closeMsg := edge.NewStateClosedMsg(conn.Id(), reason)
if err := conn.SendState(closeMsg); err != nil {
log.WithError(err).Warn("unable to send close msg to edge client")
}
}
log.Debugf("closing edge xgress conn, reason: %v", reason)
conn.mux.RemoveMsgSink(conn)
@@ -204,6 +196,17 @@ func (conn *edgeXgressConn) close(notify bool, reason string) {
// to terminate
log.Debug("closing channel sequencer, which should cause xgress to close")
conn.seq.Close()
// we must close the sequencer first, otherwise we can deadlock. The channel rxer can be blocked submitting
// the sequencer and then notify send will then be stuck writing to a partially closed channel.
if notify && !conn.IsClosed() {
// Notify edge client of close
log.Debug("sending closed to SDK client")
closeMsg := edge.NewStateClosedMsg(conn.Id(), reason)
if err := conn.SendState(closeMsg); err != nil {
log.WithError(err).Warn("unable to send close msg to edge client")
}
}
}
func (conn *edgeXgressConn) Accept(msg *channel2.Message) {