Merge pull request #14746 from ahrtr/add_gofailpoint_OnPreCommitUnsafe

etcdserver: Add gofailpoints for pre commit hook
etcd-io · Nov 14, 2022 · 3232c04 · 3232c04
2 parents d3c64ed + 2532ca8
commit 3232c04
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/server/storage/backend/batch_tx.go b/server/storage/backend/batch_tx.go
@@ -337,7 +337,9 @@ func (t *batchTxBuffered) commit(stop bool) {
 
 func (t *batchTxBuffered) unsafeCommit(stop bool) {
 	if t.backend.hooks != nil {
+		// gofail: var commitBeforePreCommitHook struct{}
 		t.backend.hooks.OnPreCommitUnsafe(t)
+		// gofail: var commitAfterPreCommitHook struct{}
 	}
 
 	if t.backend.readTx.tx != nil {

diff --git a/tests/linearizability/failpoints.go b/tests/linearizability/failpoints.go
@@ -31,16 +31,19 @@ import (
 )
 
 var (
-	KillFailpoint           Failpoint = killFailpoint{}
-	DefragBeforeCopyPanic   Failpoint = goFailpoint{"backend/defragBeforeCopy", "panic", triggerDefrag}
-	DefragBeforeRenamePanic Failpoint = goFailpoint{"backend/defragBeforeRename", "panic", triggerDefrag}
-	BeforeCommitPanic       Failpoint = goFailpoint{"backend/beforeCommit", "panic", nil}
-	AfterCommitPanic        Failpoint = goFailpoint{"backend/afterCommit", "panic", nil}
-	RaftBeforeSavePanic     Failpoint = goFailpoint{"etcdserver/raftBeforeSave", "panic", nil}
-	RaftAfterSavePanic      Failpoint = goFailpoint{"etcdserver/raftAfterSave", "panic", nil}
-	RandomFailpoint         Failpoint = randomFailpoint{[]Failpoint{
+	KillFailpoint                  Failpoint = killFailpoint{}
+	DefragBeforeCopyPanic          Failpoint = goFailpoint{"backend/defragBeforeCopy", "panic", triggerDefrag}
+	DefragBeforeRenamePanic        Failpoint = goFailpoint{"backend/defragBeforeRename", "panic", triggerDefrag}
+	BeforeCommitPanic              Failpoint = goFailpoint{"backend/beforeCommit", "panic", nil}
+	AfterCommitPanic               Failpoint = goFailpoint{"backend/afterCommit", "panic", nil}
+	RaftBeforeSavePanic            Failpoint = goFailpoint{"etcdserver/raftBeforeSave", "panic", nil}
+	RaftAfterSavePanic             Failpoint = goFailpoint{"etcdserver/raftAfterSave", "panic", nil}
+	CommitBeforePreCommitHookPanic Failpoint = goFailpoint{"backend/commitBeforePreCommitHook", "panic", nil}
+	CommitAfterPreCommitHookPanic  Failpoint = goFailpoint{"backend/commitAfterPreCommitHook", "panic", nil}
+	RandomFailpoint                Failpoint = randomFailpoint{[]Failpoint{
 		KillFailpoint, BeforeCommitPanic, AfterCommitPanic, RaftBeforeSavePanic,
 		RaftAfterSavePanic, DefragBeforeCopyPanic, DefragBeforeRenamePanic,
+		CommitBeforePreCommitHookPanic, CommitAfterPreCommitHookPanic,
 	}}
 	// TODO: Figure out how to reliably trigger below failpoints and add them to RandomFailpoint
 	raftBeforeLeaderSendPanic   Failpoint = goFailpoint{"etcdserver/raftBeforeLeaderSend", "panic", nil}