Merge pull request etcd-io#15264 from ahrtr/3.5_walSync_failpoint_202…

…30209 [3.5] etcdserver: add failpoints walBeforeSync and walAfterSync
tjungblu · Jul 26, 2023 · 9a1c0cb · 9a1c0cb
2 parents 8d79b19 + f2ecc42
commit 9a1c0cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/build.sh b/build.sh
@@ -20,7 +20,7 @@ GO_BUILD_ENV=("CGO_ENABLED=0" "GO_BUILD_FLAGS=${GO_BUILD_FLAGS}" "GOOS=${GOOS}"
 toggle_failpoints() {
   mode="$1"
   if command -v gofail >/dev/null 2>&1; then
-    run gofail "$mode" server/etcdserver/ server/mvcc/backend/
+    run gofail "$mode" server/etcdserver/ server/mvcc/backend/ server/wal/
   elif [[ "$mode" != "disable" ]]; then
     log_error "FAILPOINTS set but gofail not found"
     exit 1

diff --git a/server/wal/wal.go b/server/wal/wal.go
@@ -939,7 +939,10 @@ func (w *WAL) Save(st raftpb.HardState, ents []raftpb.Entry) error {
 	}
 	if curOff < SegmentSizeBytes {
 		if mustSync {
-			return w.sync()
+			// gofail: var walBeforeSync struct{}
+			err = w.sync()
+			// gofail: var walAfterSync struct{}
+			return err
 		}
 		return nil
 	}