Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cluster: Fix non-leader transaction errors when leader shuts down cleanly #9891

Merged
merged 3 commits into from
Feb 10, 2022
Merged

Cluster: Fix non-leader transaction errors when leader shuts down cleanly #9891

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a3a58e
lxd/cluster/gateway: Enable TCP user timeout and connection closing o…
tomponline Feb 10, 2022
7cb3cb0
lxd/cluster/gateway: Improve logging in dqliteNetworkDial
tomponline Feb 10, 2022
a03e5e3
lxd/cluster/gateway: Standardise logging naming of dqliteProxy and dq…
tomponline Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions lxd/cluster/gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
log "gopkg.in/inconshreveable/log15.v2"

"github.com/lxc/lxd/lxd/db"
"github.com/lxc/lxd/lxd/revert"
"github.com/lxc/lxd/lxd/util"
"github.com/lxc/lxd/shared"
"github.com/lxc/lxd/shared/logger"
Expand Down Expand Up @@ -362,7 +363,7 @@ func (g *Gateway) DialFunc() client.DialFunc {
return g.memoryDial(ctx, address)
}

conn, err := dqliteNetworkDial(ctx, address, g)
conn, err := dqliteNetworkDial(ctx, "dqlite", address, g)
if err != nil {
return nil, err
}
Expand All @@ -384,7 +385,7 @@ func (g *Gateway) raftDial() client.DialFunc {
if err != nil {
return nil, err
}
conn, err := dqliteNetworkDial(ctx, nodeAddress, g)
conn, err := dqliteNetworkDial(ctx, "raft", nodeAddress, g)
if err != nil {
return nil, err
}
Expand All @@ -406,7 +407,7 @@ func (g *Gateway) raftDial() client.DialFunc {

listener.Close()

go dqliteProxy("raftDial", g.stopCh, conn, goUnix)
go dqliteProxy("raft", g.stopCh, conn, goUnix)

return cUnix, nil
}
Expand Down Expand Up @@ -952,7 +953,7 @@ func (g *Gateway) nodeAddress(raftAddress string) (string, error) {
return address, nil
}

func dqliteNetworkDial(ctx context.Context, addr string, g *Gateway) (net.Conn, error) {
func dqliteNetworkDial(ctx context.Context, name string, addr string, g *Gateway) (net.Conn, error) {
config, err := tlsClientConfig(g.networkCert, g.serverCert())
if err != nil {
return nil, err
Expand Down Expand Up @@ -981,10 +982,27 @@ func dqliteNetworkDial(ctx context.Context, addr string, g *Gateway) (net.Conn,
deadline, _ := ctx.Deadline()
dialer := &net.Dialer{Timeout: time.Until(deadline)}

revert := revert.New()
defer revert.Fail()

conn, err := tls.DialWithDialer(dialer, "tcp", addr, config)
if err != nil {
return nil, fmt.Errorf("Failed connecting to HTTP endpoint %q: %w", addr, err)
}
revert.Add(func() { conn.Close() })

logger := logging.AddContext(logger.Log, log.Ctx{"name": name, "local": conn.LocalAddr(), "remote": conn.RemoteAddr()})
logger.Info("Dqlite connected outbound")

remoteTCP, err := util.ExtractTCPConn(conn)
if err != nil {
logger.Error("Failed extracting TCP connection from remote connection", log.Ctx{"err": err})
} else {
err := util.SetTCPTimeouts(remoteTCP)
if err != nil {
logger.Error("Failed setting TCP timeouts on remote connection", log.Ctx{"err": err})
}
}

err = request.Write(conn)
if err != nil {
Expand All @@ -993,7 +1011,7 @@ func dqliteNetworkDial(ctx context.Context, addr string, g *Gateway) (net.Conn,

response, err := http.ReadResponse(bufio.NewReader(conn), request)
if err != nil {
return nil, errors.Wrap(err, "Failed to read response")
return nil, fmt.Errorf("Failed to read response: %w", err)
}

// If the remote server has detected that we are out of date, let's
Expand All @@ -1017,6 +1035,7 @@ func dqliteNetworkDial(ctx context.Context, addr string, g *Gateway) (net.Conn,
return nil, fmt.Errorf("Missing or unexpected Upgrade header in response")
}

revert.Success()
return conn, nil
}

Expand Down Expand Up @@ -1056,7 +1075,7 @@ func runDqliteProxy(stopCh chan struct{}, bindAddress string, acceptCh chan net.
continue
}

go dqliteProxy("runDqliteProxy", stopCh, remote, local)
go dqliteProxy("dqlite", stopCh, remote, local)
}
}

Expand Down