Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: return error when tombstone on new generation

Browse Source 
It is not allowed to put tombstone on an empty generation.
This commit is contained in:
Yicheng Qin 2015-08-24 23:52:14 -07:00
parent ffa87f9678
commit ad8a291dc1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/index.go
View File

@ -115,8 +115,7 @@ func (ti *treeIndex) Tombstone(key []byte, rev revision) error {
} }
ki := item.(*keyIndex) ki := item.(*keyIndex)
ki.tombstone(rev.main, rev.sub) return ki.tombstone(rev.main, rev.sub)
return nil
} }
func (ti *treeIndex) Compact(rev int64) map[revision]struct{} { func (ti *treeIndex) Compact(rev int64) map[revision]struct{} {

7
storage/key_index.go
View File

@ -90,12 +90,17 @@ func (ki *keyIndex) restore(created, modified revision, ver int64) {
// tombstone puts a revision, pointing to a tombstone, to the keyIndex. // tombstone puts a revision, pointing to a tombstone, to the keyIndex.
// It also creates a new empty generation in the keyIndex. // It also creates a new empty generation in the keyIndex.
func (ki *keyIndex) tombstone(main int64, sub int64) { // It returns ErrRevisionNotFound when tombstone on an empty generation.
func (ki *keyIndex) tombstone(main int64, sub int64) error {
if ki.isEmpty() { if ki.isEmpty() {
log.Panicf("store.keyindex: unexpected tombstone on empty keyIndex %s", string(ki.key)) log.Panicf("store.keyindex: unexpected tombstone on empty keyIndex %s", string(ki.key))
} }
if ki.generations[len(ki.generations)-1].isEmpty() {
return ErrRevisionNotFound
}
ki.put(main, sub) ki.put(main, sub)
ki.generations = append(ki.generations, generation{}) ki.generations = append(ki.generations, generation{})
return nil
} }
// get gets the modified, created revision and version of the key that satisfies the given atRev. // get gets the modified, created revision and version of the key that satisfies the given atRev.