temp: debug commit

chainntnfs/txnotifier.go

@@ -957,6 +957,9 @@ func (n *TxNotifier) dispatchConfDetails(
 		case ntfn.Event.Confirmed <- details:
 			ntfn.dispatched = true
 		case <-n.quit:
+			Log.Debugf("TxNotifier exiting when notifying for %v "+
+				"confs, conf_id=%v, %v", ntfn.NumConfirmations,
+				ntfn.ConfID, ntfn.ConfRequest)
 			return ErrTxNotifierExiting
 		}
 	} else {
@@ -1784,6 +1787,9 @@ func (n *TxNotifier) NotifyHeight(height uint32) error {
 		case ntfn.Event.Confirmed <- &confDetails:
 			ntfn.dispatched = true
 		case <-n.quit:
+			Log.Debugf("TxNotifier exiting when notifying for %v "+
+				"confs, conf_id=%v, %v", ntfn.NumConfirmations,
+				ntfn.ConfID, ntfn.ConfRequest)
 			return ErrTxNotifierExiting
 		}
 	}
@@ -1854,6 +1860,9 @@ func (n *TxNotifier) DisconnectTip(blockHeight uint32) error {
 				select {
 				case <-ntfn.Event.Updates:
 				case <-n.quit:
+					Log.Debugf("TxNotifier exiting when notifying for %v "+
+						"confs, conf_id=%v, %v", ntfn.NumConfirmations,
+						ntfn.ConfID, ntfn.ConfRequest)
 					return ErrTxNotifierExiting
 				default:
 				}
@@ -2023,6 +2032,9 @@ func (n *TxNotifier) dispatchConfReorg(ntfn *ConfNtfn,
 	select {
 	case <-ntfn.Event.Confirmed:
 	case <-n.quit:
+		Log.Debugf("TxNotifier exiting when notifying for %v "+
+			"confs, conf_id=%v, %v", ntfn.NumConfirmations,
+			ntfn.ConfID, ntfn.ConfRequest)
 		return ErrTxNotifierExiting
 	default:
 	}
@@ -2034,6 +2046,9 @@ func (n *TxNotifier) dispatchConfReorg(ntfn *ConfNtfn,
 	select {
 	case ntfn.Event.NegativeConf <- int32(n.reorgDepth):
 	case <-n.quit:
+		Log.Debugf("TxNotifier exiting when notifying for %v "+
+			"confs, conf_id=%v, %v", ntfn.NumConfirmations,
+			ntfn.ConfID, ntfn.ConfRequest)
 		return ErrTxNotifierExiting
 	}
 
@@ -2061,6 +2076,8 @@ func (n *TxNotifier) dispatchSpendReorg(ntfn *SpendNtfn) error {
 	select {
 	case ntfn.Event.Reorg <- struct{}{}:
 	case <-n.quit:
+		Log.Debugf("TxNotifier exiting when notifying for conf_id=%v, %v",
+			ntfn.SpendID, ntfn.SpendRequest)
 		return ErrTxNotifierExiting
 	}
 
@@ -2119,6 +2136,9 @@ func (n *TxNotifier) notifyNumConfsLeft(ntfn *ConfNtfn, num uint32) error {
 	select {
 	case ntfn.Event.Updates <- num:
 	case <-n.quit:
+		Log.Debugf("TxNotifier exiting when notifying for %v "+
+			"confs, conf_id=%v, %v", ntfn.NumConfirmations,
+			ntfn.ConfID, ntfn.ConfRequest)
 		return ErrTxNotifierExiting
 	}
 

funding/manager.go

@@ -5,6 +5,7 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
+	"runtime"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -783,12 +784,24 @@ func (f *Manager) Stop() error {
 		defer log.Debug("Funding manager shutdown complete")
 
 		close(f.quit)
+		log.Infof("%s", stack())
 		f.wg.Wait()
 	})
 
 	return nil
 }
 
+func stack() []byte {
+	buf := make([]byte, 1024)
+	for {
+		n := runtime.Stack(buf, true)
+		if n < len(buf) {
+			return buf[:n]
+		}
+		buf = make([]byte, 2*len(buf))
+	}
+}
+
 // rebroadcastFundingTx publishes the funding tx on startup for each
 // unconfirmed channel.
 func (f *Manager) rebroadcastFundingTx(c *channeldb.OpenChannel) {

kvdb/sqlbase/db.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"runtime/debug"
 	"strings"
 	"sync"
 	"time"
@@ -238,8 +239,8 @@ func (db *db) executeTransaction(f func(tx walletdb.ReadWriteTx) error,
 	}
 
 	onBackoff := func(retry int, delay time.Duration) {
-		log.Tracef("Retrying transaction due to tx serialization "+
-			"error, attempt_number=%v, delay=%v", retry, delay)
+		log.Debugf("Retrying transaction due to tx serialization "+
+			"error, attempt_number=%v, delay=%v: %s", retry, delay, debug.Stack())
 	}
 
 	rollbackTx := func(tx sqldb.Tx) error {

log.go

@@ -5,6 +5,7 @@ import (
 	"github.com/btcsuite/btcd/rpcclient"
 	btclogv1 "github.com/btcsuite/btclog"
 	"github.com/btcsuite/btclog/v2"
+	"github.com/btcsuite/btcwallet/waddrmgr"
 	"github.com/lightninglabs/neutrino"
 	sphinx "github.com/lightningnetwork/lightning-onion"
 	"github.com/lightningnetwork/lnd/autopilot"
@@ -26,6 +27,7 @@ import (
 	"github.com/lightningnetwork/lnd/healthcheck"
 	"github.com/lightningnetwork/lnd/htlcswitch"
 	"github.com/lightningnetwork/lnd/invoices"
+	"github.com/lightningnetwork/lnd/kvdb/sqlbase"
 	"github.com/lightningnetwork/lnd/lncfg"
 	"github.com/lightningnetwork/lnd/lnrpc/autopilotrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
@@ -177,6 +179,9 @@ func SetupLoggers(root *build.SubLoggerManager, interceptor signal.Interceptor)
 	AddSubLogger(root, "CHCL", interceptor, chancloser.UseLogger)
 	AddSubLogger(root, "LCHN", interceptor, localchans.UseLogger)
 
+	AddV1SubLogger(root, "WMGR", interceptor, waddrmgr.UseLogger)
+	AddSubLogger(root, "SQLB", interceptor, sqlbase.UseLogger)
+
 	AddSubLogger(root, routing.Subsystem, interceptor, routing.UseLogger)
 	AddSubLogger(root, routerrpc.Subsystem, interceptor, routerrpc.UseLogger)
 	AddSubLogger(root, chanfitness.Subsystem, interceptor, chanfitness.UseLogger)