Archives/chantools
2
0
Fork 0
mirror of https://github.com/guggero/chantools synced 2024-11-11 01:10:42 +00:00
Code Issues Releases Wiki Activity

lnd+walletinfo: return more verbose error on DB timeout

Browse Source 
Fixes #18. Any bbolt database has a unique lock, meaning it cannot be
opened by two processes at the same time. The simple "timeout" error
that is returned if opening fails is not very informative though.
This commit is contained in:
Oliver Gugger 2021-05-07 19:17:29 +02:00
parent af356685c1
commit 994b669a0c
No known key found for this signature in database
GPG Key ID: 8E4256593F177720
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/chantools/walletinfo.go
View File

@ -2,6 +2,7 @@ package main
import ( import (
"fmt" "fmt"
"go.etcd.io/bbolt"
"os" "os"
"strings" "strings"
@ -140,6 +141,11 @@ func (c *walletInfoCommand) Execute(_ *cobra.Command, _ []string) error {
"bdb", lncfg.CleanAndExpandPath(c.WalletDB), false, "bdb", lncfg.CleanAndExpandPath(c.WalletDB), false,
lnd.DefaultOpenTimeout, lnd.DefaultOpenTimeout,
) )
if err == bbolt.ErrTimeout {
return fmt.Errorf("error opening wallet database, make sure " +
"lnd is not running and holding the exclusive lock " +
"on the wallet")
}
if err != nil { if err != nil {
return fmt.Errorf("error opening wallet database: %v", err) return fmt.Errorf("error opening wallet database: %v", err)
} }

6
lnd/channeldb.go
View File

@ -1,6 +1,7 @@
package lnd package lnd
import ( import (
"fmt"
"io" "io"
"os" "os"
"time" "time"
@ -16,6 +17,11 @@ const (
func OpenDB(dbPath string, readonly bool) (*channeldb.DB, error) { func OpenDB(dbPath string, readonly bool) (*channeldb.DB, error) {
backend, err := openDB(dbPath, false, readonly, DefaultOpenTimeout) backend, err := openDB(dbPath, false, readonly, DefaultOpenTimeout)
if err == bbolt.ErrTimeout {
return nil, fmt.Errorf("error opening %s: make sure lnd is "+
"not running, database is locked by another process",
dbPath)
}
if err != nil { if err != nil {
return nil, err return nil, err
} }