From 8a87769a0915efb85fe856cfac2343cc1bf3d724 Mon Sep 17 00:00:00 2001
From: sharat <sinsharat@gmail.com>
Date: Wed, 25 Jan 2017 03:05:55 +0530
Subject: [PATCH] etcdserver: use prev-lease for 'ignore_lease' writes

---
 etcdserver/apply.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/etcdserver/apply.go b/etcdserver/apply.go
index c30a37a31..0b27b3f5b 100644
--- a/etcdserver/apply.go
+++ b/etcdserver/apply.go
@@ -161,7 +161,7 @@ func (a *applierV3backend) Put(txnID int64, p *pb.PutRequest) (*pb.PutResponse,
 	)
 
 	var rr *mvcc.RangeResult
-	if p.PrevKv || p.IgnoreValue {
+	if p.PrevKv || p.IgnoreValue || p.IgnoreLease {
 		if txnID != noTxn {
 			rr, err = a.s.KV().TxnRange(txnID, p.Key, nil, mvcc.RangeOptions{})
 			if err != nil {
@@ -183,6 +183,14 @@ func (a *applierV3backend) Put(txnID int64, p *pb.PutRequest) (*pb.PutResponse,
 		p.Value = rr.KVs[0].Value
 	}
 
+	if p.IgnoreLease {
+		if rr == nil || len(rr.KVs) == 0 {
+			// ignore_lease flag expects previous key-value pair
+			return nil, ErrKeyNotFound
+		}
+		p.Lease = rr.KVs[0].Lease
+	}
+
 	if txnID != noTxn {
 		rev, err = a.s.KV().TxnPut(txnID, p.Key, p.Value, lease.LeaseID(p.Lease))
 		if err != nil {
@@ -767,7 +775,7 @@ func (a *applierV3backend) checkRequestPut(reqs []*pb.RequestOp) error {
 		if preq == nil {
 			continue
 		}
-		if preq.IgnoreValue {
+		if preq.IgnoreValue || preq.IgnoreLease {
 			// expects previous key-value, error if not exist
 			rr, err := a.s.KV().Range(preq.Key, nil, mvcc.RangeOptions{})
 			if err != nil {