vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6856 from heyitsanthony/proxy-lease-fix 

grpcproxy: copy range request before storing in cache
release-3.1
Anthony Romano 2016-11-15 15:43:00 -08:00 committed by GitHub
parent 7c8f13aed7 1358a9d460
commit e55b8485dd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proxy/grpcproxy/kv.go
View File

@ -51,9 +51,10 @@ func (p *kvProxy) Range(ctx context.Context, r *pb.RangeRequest) (*pb.RangeRespo
}
// cache linearizable as serializable
r.Serializable = true
req := *r
req.Serializable = true
gresp := (*pb.RangeResponse)(resp.Get())
p.cache.Add(r, gresp)
p.cache.Add(&req, gresp)
return gresp, nil
}
@ -79,9 +80,9 @@ func (p *kvProxy) txnToCache(reqs []*pb.RequestOp, resps []*pb.ResponseOp) {
rdr := reqs[i].GetRequestDeleteRange()
p.cache.Invalidate(rdr.Key, rdr.RangeEnd)
case *pb.ResponseOp_ResponseRange:
req := reqs[i].GetRequestRange()
req := *(reqs[i].GetRequestRange())
req.Serializable = true
p.cache.Add(req, tv.ResponseRange)
p.cache.Add(&req, tv.ResponseRange)
}
}
}