Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
Showing only changes of commit add1bff13f - Show all commits

View File

@ -318,30 +318,35 @@ func (f *Freezer) Sync() error {
return nil return nil
} }
// validate checks that every table has the same length. // validate checks that every table has the same boundary.
// Used instead of `repair` in readonly mode. // Used instead of `repair` in readonly mode.
func (f *Freezer) validate() error { func (f *Freezer) validate() error {
if len(f.tables) == 0 { if len(f.tables) == 0 {
return nil return nil
} }
var ( var (
length uint64 head uint64
name string tail uint64
name string
) )
// Hack to get length of any table // Hack to get boundary of any table
for kind, table := range f.tables { for kind, table := range f.tables {
length = atomic.LoadUint64(&table.items) head = atomic.LoadUint64(&table.items)
tail = atomic.LoadUint64(&table.itemHidden)
name = kind name = kind
break break
} }
// Now check every table against that length // Now check every table against those boundaries.
for kind, table := range f.tables { for kind, table := range f.tables {
items := atomic.LoadUint64(&table.items) if head != atomic.LoadUint64(&table.items) {
if length != items { return fmt.Errorf("freezer tables %s and %s have differing head: %d != %d", kind, name, atomic.LoadUint64(&table.items), head)
return fmt.Errorf("freezer tables %s and %s have differing lengths: %d != %d", kind, name, items, length) }
if tail != atomic.LoadUint64(&table.itemHidden) {
return fmt.Errorf("freezer tables %s and %s have differing tail: %d != %d", kind, name, atomic.LoadUint64(&table.itemHidden), tail)
} }
} }
atomic.StoreUint64(&f.frozen, length) atomic.StoreUint64(&f.frozen, head)
atomic.StoreUint64(&f.tail, tail)
return nil return nil
} }