From 9ff07304a37799fc820bb4b29ca3ba2a2a3b458f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Fri, 11 Mar 2016 09:30:25 +0200 Subject: Godeps: pull in the leveldb upstream write race fix --- .../_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go') diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go index fb7896139..5576761fe 100644 --- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go +++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/db_write.go @@ -166,15 +166,15 @@ func (db *DB) Write(b *Batch, wo *opt.WriteOptions) (err error) { merged := 0 danglingMerge := false defer func() { + for i := 0; i < merged; i++ { + db.writeAckC <- err + } if danglingMerge { // Only one dangling merge at most, so this is safe. db.writeMergedC <- false } else { <-db.writeLockC } - for i := 0; i < merged; i++ { - db.writeAckC <- err - } }() mdb, mdbFree, err := db.flush(b.size()) -- cgit v1.2.3