Merge pull request #14733 from ahrtr/rev_inconsistency_3.5

ahrtr · web-flow · commit 5f387e6b7dbd · 2022-11-14T17:54:22.000+08:00
[3.5] etcdserver: call the OnPreCommitUnsafe in unsafeCommit
diff --git a/server/mvcc/backend/batch_tx.go b/server/mvcc/backend/batch_tx.go
@@ -329,17 +329,16 @@ func (t *batchTxBuffered) CommitAndStop() {
 }
 
 func (t *batchTxBuffered) commit(stop bool) {
-	if t.backend.hooks != nil {
-		t.backend.hooks.OnPreCommitUnsafe(t)
-	}
-
 	// all read txs must be closed to acquire boltdb commit rwlock
 	t.backend.readTx.Lock()
 	t.unsafeCommit(stop)
 	t.backend.readTx.Unlock()
 }
 
 func (t *batchTxBuffered) unsafeCommit(stop bool) {
+	if t.backend.hooks != nil {
+		t.backend.hooks.OnPreCommitUnsafe(t)
+	}
 	if t.backend.readTx.tx != nil {
 		// wait all store read transactions using the current boltdb tx to finish,
 		// then close the boltdb tx
