lnd+triggerforceclose: close DB correctly

Author: guggero

cmd/chantools/triggerforceclose.go

@@ -311,7 +311,11 @@ func noiseDial(idKey keychain.SingleKeyECDH, lnAddr *lnwire.NetAddress,
 }
 
 func connectPeer(peerHost, torProxy string, identity keychain.SingleKeyECDH,
-	dialTimeout time.Duration) (*peer.Brontide, error) {
+	dialTimeout time.Duration) (*peer.Brontide, func() error, error) {
+
+	cleanup := func() error {
+		return nil
+	}
 
 	var dialNet tor.Net = &tor.ClearNet{}
 	if torProxy != "" {
@@ -328,7 +332,8 @@ func connectPeer(peerHost, torProxy string, identity keychain.SingleKeyECDH,
 		peerHost, "9735", dialNet.ResolveTCPAddr,
 	)
 	if err != nil {
-		return nil, fmt.Errorf("error parsing peer address: %w", err)
+		return nil, cleanup, fmt.Errorf("error parsing peer address: "+
+			"%w", err)
 	}
 
 	peerPubKey := peerAddr.IdentityKey
@@ -337,7 +342,11 @@ func connectPeer(peerHost, torProxy string, identity keychain.SingleKeyECDH,
 		peerAddr.String())
 	conn, err := noiseDial(identity, peerAddr, dialNet, dialTimeout)
 	if err != nil {
-		return nil, fmt.Errorf("error dialing peer: %w", err)
+		return nil, cleanup, fmt.Errorf("error dialing peer: %w", err)
+	}
+
+	cleanup = func() error {
+		return conn.Close()
 	}
 
 	log.Infof("Attempting to establish p2p connection to peer %x, dial"+
@@ -346,9 +355,20 @@ func connectPeer(peerHost, torProxy string, identity keychain.SingleKeyECDH,
 		Addr:      peerAddr,
 		Permanent: false,
 	}
-	p, err := lnd.ConnectPeer(conn, req, chainParams, identity)
+	p, channelDB, err := lnd.ConnectPeer(conn, req, chainParams, identity)
 	if err != nil {
-		return nil, fmt.Errorf("error connecting to peer: %w", err)
+		return nil, cleanup, fmt.Errorf("error connecting to peer: %w",
+			err)
+	}
+
+	cleanup = func() error {
+		p.Disconnect(errors.New("done with peer"))
+		if channelDB != nil {
+			if err := channelDB.Close(); err != nil {
+				log.Errorf("Error closing channel DB: %v", err)
+			}
+		}
+		return conn.Close()
 	}
 
 	log.Infof("Connection established to peer %x",
@@ -358,17 +378,23 @@ func connectPeer(peerHost, torProxy string, identity keychain.SingleKeyECDH,
 	select {
 	case <-p.ActiveSignal():
 	case <-p.QuitSignal():
-		return nil, fmt.Errorf("peer %x disconnected",
+		return nil, cleanup, fmt.Errorf("peer %x disconnected",
 			peerPubKey.SerializeCompressed())
 	}
 
-	return p, nil
+	return p, cleanup, nil
 }
 
 func requestForceClose(peerHost, torProxy string, channelPoint wire.OutPoint,
 	identity keychain.SingleKeyECDH) error {
 
-	p, err := connectPeer(peerHost, torProxy, identity, dialTimeout)
+	p, cleanup, err := connectPeer(
+		peerHost, torProxy, identity, dialTimeout,
+	)
+	defer func() {
+		_ = cleanup()
+	}()
+
 	if err != nil {
 		return fmt.Errorf("error connecting to peer: %w", err)
 	}
@@ -405,6 +431,9 @@ func requestForceClose(peerHost, torProxy string, channelPoint wire.OutPoint,
 		return fmt.Errorf("error sending message: %w", err)
 	}
 
+	// Wait a few seconds to give the peer time to process the message.
+	time.Sleep(5 * time.Second)
+
 	return nil
 }
 

lnd/brontide.go

@@ -3,6 +3,7 @@ package lnd
 import (
 	"errors"
 	"fmt"
+	"math/rand"
 	"os"
 	"time"
 
@@ -53,11 +54,12 @@ var (
 
 func ConnectPeer(conn *brontide.Conn, connReq *connmgr.ConnReq,
 	netParams *chaincfg.Params,
-	identityECDH keychain.SingleKeyECDH) (*peer.Brontide, error) {
+	identityECDH keychain.SingleKeyECDH) (*peer.Brontide, *channeldb.DB,
+	error) {
 
 	featureMgr, err := feature.NewManager(feature.Config{})
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	initFeatures := featureMgr.Get(feature.SetInit)
@@ -72,7 +74,7 @@ func ConnectPeer(conn *brontide.Conn, connReq *connmgr.ConnReq,
 	}
 	errBuffer, err := queue.NewCircularBuffer(500)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	pongBuf := make([]byte, lnwire.MaxPongBytes)
@@ -99,27 +101,31 @@ func ConnectPeer(conn *brontide.Conn, connReq *connmgr.ConnReq,
 	)
 
 	if err := writePool.Start(); err != nil {
-		return nil, fmt.Errorf("unable to start write pool: %w", err)
+		return nil, nil, fmt.Errorf("unable to start write pool: %w",
+			err)
 	}
 	if err := readPool.Start(); err != nil {
-		return nil, fmt.Errorf("unable to start read pool: %w", err)
+		return nil, nil, fmt.Errorf("unable to start read pool: %w",
+			err)
 	}
 
+	randNum := rand.Int31()
 	backend, err := kvdb.GetBoltBackend(&kvdb.BoltBackendConfig{
 		DBPath:            os.TempDir(),
-		DBFileName:        "channel.db",
+		DBFileName:        fmt.Sprintf("channel-%d.db", randNum),
 		NoFreelistSync:    true,
 		AutoCompact:       false,
 		AutoCompactMinAge: kvdb.DefaultBoltAutoCompactMinAge,
 		DBTimeout:         kvdb.DefaultDBTimeout,
 	})
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	channelDB, err := channeldb.CreateWithBackend(backend)
 	if err != nil {
-		return nil, err
+		_ = backend.Close()
+		return nil, nil, err
 	}
 
 	gossiper := discovery.New(discovery.Config{
@@ -212,7 +218,8 @@ func ConnectPeer(conn *brontide.Conn, connReq *connmgr.ConnReq,
 		},
 	)
 	if err != nil {
-		return nil, fmt.Errorf("unable to create interceptable "+
+		_ = channelDB.Close()
+		return nil, nil, fmt.Errorf("unable to create interceptable "+
 			"switch: %w", err)
 	}
 
@@ -322,8 +329,9 @@ func ConnectPeer(conn *brontide.Conn, connReq *connmgr.ConnReq,
 
 	p := peer.NewBrontide(pCfg)
 	if err := p.Start(); err != nil {
-		return nil, err
+		_ = channelDB.Close()
+		return nil, nil, err
 	}
 
-	return p, nil
+	return p, channelDB, nil
 }