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 #4455 from heyitsanthony/etcdctlv3-compaction-err

Browse Source 
etcdctlv3: report compaction error, if any
This commit is contained in:
Anthony Romano 2016-02-08 19:15:40 -08:00
commit 15c8876e4c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientv3/kv.go
View File

@ -124,7 +124,7 @@ func (kv *kv) Compact(rev int64) error {
}
go kv.switchRemote(err)
return nil
return err
}
func (kv *kv) Txn() Txn {

13
etcdctlv3/command/compaction_command.go
View File

@ -19,14 +19,13 @@ import (
"strconv"
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/spf13/cobra"
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/clientv3"
)
// NewCompactionCommand returns the cobra command for "compaction".
func NewCompactionCommand() *cobra.Command {
return &cobra.Command{
Use: "compaction",
Use: "compaction <revision>",
Short: "Compaction compacts the event history in etcd.",
Run: compactionCommandFunc,
}
@ -43,6 +42,10 @@ func compactionCommandFunc(cmd *cobra.Command, args []string) {
ExitWithError(ExitError, err)
}
req := &pb.CompactionRequest{Revision: rev}
mustClient(cmd).KV.Compact(context.Background(), req)
c := mustClient(cmd)
if cerr := clientv3.NewKV(c).Compact(rev); cerr != nil {
ExitWithError(ExitError, cerr)
return
}
fmt.Println("compacted revision", rev)
}