For etcd client failover all requests should require a leader.

-This workaround is mentioned here: core/etcd - etcd-io/etcd#8660
portworx · May 26, 2018 · b063e8c · b063e8c
1 parent b699888
commit b063e8c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/etcd/v3/kv_etcd.go b/etcd/v3/kv_etcd.go
@@ -168,7 +168,7 @@ func (et *etcdKV) Capabilities() int {
 }
 
 func (et *etcdKV) Context() (context.Context, context.CancelFunc) {
-	return context.WithTimeout(context.Background(), defaultKvRequestTimeout)
+	return context.WithTimeout(getContextWithLeaderRequirement(), defaultKvRequestTimeout)
 }
 
 func (et *etcdKV) MaintenanceContext() (context.Context, context.CancelFunc) {
@@ -904,7 +904,7 @@ func (et *etcdKV) watchStart(
 		_ = cb(key, opaque, nil, kvdb.ErrWatchStopped)
 		return
 	}
-	ctx, watchCancel := context.WithCancel(context.Background())
+	ctx, watchCancel := et.Context()
 	watchRet := make(chan error)
 	watchChan := et.kvClient.Watch(ctx, key, opts...)
 	watchQ := newWatchQ(opaque, cb, watchRet)