Merge pull request #8672 from gyuho/require-leader

gyuho · web-flow · commit e47be1f32501 · 2017-10-09T13:38:52.000-07:00
etcdctl/ctlv3: enable 'require-leader' for 'watch' command
diff --git a/etcdctl/ctlv3/command/watch_command.go b/etcdctl/ctlv3/command/watch_command.go
@@ -125,7 +125,7 @@ func getWatchChan(c *clientv3.Client, args []string) (clientv3.WatchChan, error)
 	if watchPrevKey {
 		opts = append(opts, clientv3.WithPrevKV())
 	}
-	return c.Watch(context.TODO(), key, opts...), nil
+	return c.Watch(clientv3.WithRequireLeader(context.Background()), key, opts...), nil
 }
 
 func printWatchCh(ch clientv3.WatchChan) {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func getWatchChan(c *clientv3.Client, args []string) (clientv3.WatchChan, error)`
`125`	`125`	`if watchPrevKey {`
`126`	`126`	`opts = append(opts, clientv3.WithPrevKV())`
`127`	`127`	`}`
`128`		`- return c.Watch(context.TODO(), key, opts...), nil`
	`128`	`+ return c.Watch(clientv3.WithRequireLeader(context.Background()), key, opts...), nil`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`func printWatchCh(ch clientv3.WatchChan) {`