Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9343 from gyuho/vvv

Browse Source 
*: fix govet -shadow warnings
This commit is contained in:
Gyuho Lee 2018-02-21 10:53:04 -08:00 committed by GitHub
commit 4fd378ee80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdctl/ctlv2/command/backup_command.go
View File

@ -189,11 +189,11 @@ func saveDB(destDB, srcDB string, idx uint64, v3 bool) {
var src *bolt.DB var src *bolt.DB
ch := make(chan *bolt.DB, 1) ch := make(chan *bolt.DB, 1)
go func() { go func() {
src, err := bolt.Open(srcDB, 0444, &bolt.Options{ReadOnly: true}) db, err := bolt.Open(srcDB, 0444, &bolt.Options{ReadOnly: true})
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
ch <- src ch <- db
}() }()
select { select {
case src = <-ch: case src = <-ch:

4
tools/functional-tester/etcd-runner/command/global.go
View File

@ -106,9 +106,9 @@ func doRounds(rcs []roundClient, rounds int, requests int) {
} }
func endpointsFromFlag(cmd *cobra.Command) []string { func endpointsFromFlag(cmd *cobra.Command) []string {
endpoints, err := cmd.Flags().GetStringSlice("endpoints") eps, err := cmd.Flags().GetStringSlice("endpoints")
if err != nil { if err != nil {
ExitWithError(ExitError, err) ExitWithError(ExitError, err)
} }
return endpoints return eps
} }