From: Michael Anthony Knyszek <mknyszek@google.com>
Date: Mon, 10 Feb 2025 23:54:56 +0000 (+0000)
Subject: internal/trace: increment sync counter before final Sync on error
X-Git-Tag: go1.25rc1~1086
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=887d9ef6101c6efeef00b0c7c80e634ff983fdcc;p=gostls13.git

internal/trace: increment sync counter before final Sync on error

CL 648195 was supposed to have fixed #71615, but it didn't include an
update to r.syncs. I can confirm this CL fixes the issue even when
running the test many times in a row.

Fixes #71615.

Change-Id: I97db3d639dc5bc8648a191696f90b0e5087307c8
Reviewed-on: https://go-review.googlesource.com/c/go/+/648315
Auto-Submit: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
TryBot-Bypass: Michael Knyszek <mknyszek@google.com>
---

diff --git a/src/internal/trace/reader.go b/src/internal/trace/reader.go
index 75b88f7bac..f5f871763f 100644
--- a/src/internal/trace/reader.go
+++ b/src/internal/trace/reader.go
@@ -154,6 +154,7 @@ func (r *Reader) ReadEvent() (e Event, err error) {
 		// Read the next generation.
 		r.gen, r.spill, r.spillErr = readGeneration(r.r, r.spill)
 		if r.gen == nil {
+			r.syncs++
 			return syncEvent(nil, r.lastTs, r.syncs), nil
 		}