From aa9d3c8b74f1ac9793daa648b84662a2817955da Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Mon, 8 Feb 2016 14:48:30 -0800
Subject: [PATCH] etcdctlv3: report compaction error, if any

---
 clientv3/kv.go                          |  2 +-
 etcdctlv3/command/compaction_command.go | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/clientv3/kv.go b/clientv3/kv.go
index 2ea7444de..383c392ec 100644
--- a/clientv3/kv.go
+++ b/clientv3/kv.go
@@ -124,7 +124,7 @@ func (kv *kv) Compact(rev int64) error {
 	}
 
 	go kv.switchRemote(err)
-	return nil
+	return err
 }
 
 func (kv *kv) Txn() Txn {
diff --git a/etcdctlv3/command/compaction_command.go b/etcdctlv3/command/compaction_command.go
index cb6aa8a37..5d60050e4 100644
--- a/etcdctlv3/command/compaction_command.go
+++ b/etcdctlv3/command/compaction_command.go
@@ -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)
 }