vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #10268 from gyuho/dump-db 

tools/etcd-dump-db: add "--timeout" flag
release-3.4
Gyuho Lee 2018-11-15 23:16:24 -08:00 committed by GitHub
parent af893d3549 f8a513ce65
commit bb25891960
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/etcd-dump-db/backend.go
View File

@ -32,9 +32,9 @@ func snapDir(dataDir string) string {
}
func getBuckets(dbPath string) (buckets []string, err error) {
db, derr := bolt.Open(dbPath, 0600, &bolt.Options{})
db, derr := bolt.Open(dbPath, 0600, &bolt.Options{Timeout: flockTimeout})
if derr != nil {
return nil, derr
return nil, fmt.Errorf("failed to open bolt DB %v", derr)
}
defer db.Close()
@ -94,9 +94,9 @@ func leaseDecoder(k, v []byte) {
}
func iterateBucket(dbPath, bucket string, limit uint64, decode bool) (err error) {
db, derr := bolt.Open(dbPath, 0600, &bolt.Options{})
if derr != nil {
return derr
db, err := bolt.Open(dbPath, 0600, &bolt.Options{Timeout: flockTimeout})
if err != nil {
return fmt.Errorf("failed to open bolt DB %v", err)
}
defer db.Close()

3
tools/etcd-dump-db/main.go
View File

@ -20,6 +20,7 @@ import (
"os"
"path/filepath"
"strings"
"time"
"github.com/spf13/cobra"
)
@ -46,10 +47,12 @@ var (
}
)
var flockTimeout time.Duration
var iterateBucketLimit uint64
var iterateBucketDecode bool
func init() {
rootCommand.PersistentFlags().DurationVar(&flockTimeout, "timeout", 10*time.Second, "time to wait to obtain a file lock on db file, 0 to block indefinitely")
iterateBucketCommand.PersistentFlags().Uint64Var(&iterateBucketLimit, "limit", 0, "max number of key-value pairs to iterate (0< to iterate all)")
iterateBucketCommand.PersistentFlags().BoolVar(&iterateBucketDecode, "decode", false, "true to decode Protocol Buffer encoded data")