From 92a7b5df809f29fe894903f95bb76796f15c5960 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Wed, 23 May 2018 12:09:03 -0700 Subject: [PATCH] mvcc/backend: clean up mutex, logging Signed-off-by: Gyuho Lee --- mvcc/backend/batch_tx.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mvcc/backend/batch_tx.go b/mvcc/backend/batch_tx.go index 91ac1338a..66a5ff1db 100644 --- a/mvcc/backend/batch_tx.go +++ b/mvcc/backend/batch_tx.go @@ -136,15 +136,15 @@ func (t *batchTx) UnsafeForEach(bucketName []byte, visitor func(k, v []byte) err // Commit commits a previous tx and begins a new writable one. func (t *batchTx) Commit() { t.Lock() - defer t.Unlock() t.commit(false) + t.Unlock() } // CommitAndStop commits the previous tx and do not create a new one. func (t *batchTx) CommitAndStop() { t.Lock() - defer t.Unlock() t.commit(true) + t.Unlock() } func (t *batchTx) Unlock() { @@ -163,9 +163,11 @@ func (t *batchTx) commit(stop bool) { return } start := time.Now() + // gofail: var beforeCommit struct{} err = t.tx.Commit() // gofail: var afterCommit struct{} + commitDurations.Observe(time.Since(start).Seconds()) atomic.AddInt64(&t.backend.commits, 1)