CatAClock/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-04-25 04:57:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[v11.0/forgejo] fix: delay-write trace.dat for forgejo diagnosis (#7601)

Browse source 
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/7597

- Delay the writing of `trace.dat` to the forgejo diagnosis zip file. It's not possible to write `cpu-profile.dat` and `trace.dat` at the same time. This caused the implemention to prematurely close `cpu-profile.dat` and leave it as an empty file.
- Regression of forgejo/forgejo#6470

## Testing
1. Go to `/admin/monitor`
2. Click on "Download diagnosis report"
3. Open the zip file and check that all files are non-empty.

Co-authored-by: Gusted <postmaster@gusted.xyz>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7601
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
This commit is contained in:
forgejo-backport-action 2025-04-23 13:40:51 +00:00 • committed by Gusted
parent 9147665e2c
commit 5ffe4e54e1
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
routers/web/admin/diagnosis.go
View file

@ -5,7 +5,9 @@ package admin
import (
"archive/zip"
"bytes"
"fmt"
"io"
"runtime"
"runtime/pprof"
"runtime/trace"
@ -45,14 +47,9 @@ func MonitorDiagnosis(ctx *context.Context) {
_, _ = f.Write([]byte(err.Error()))
}
f, err = zipWriter.CreateHeader(&zip.FileHeader{Name: "trace.dat", Method: zip.Deflate, Modified: time.Now()})
if err != nil {
ctx.ServerError("Failed to create zip file", err)
return
}
if err := trace.Start(f); err != nil {
_, _ = f.Write([]byte(err.Error()))
traceBuf := &bytes.Buffer{}
if err := trace.Start(traceBuf); err != nil {
_, _ = traceBuf.Write([]byte(err.Error()))
}
select {
@ -62,6 +59,17 @@ func MonitorDiagnosis(ctx *context.Context) {
pprof.StopCPUProfile()
trace.Stop()
f, err = zipWriter.CreateHeader(&zip.FileHeader{Name: "trace.dat", Method: zip.Deflate, Modified: time.Now()})
if err != nil {
ctx.ServerError("Failed to create zip file", err)
return
}
if _, err := io.Copy(f, traceBuf); err != nil {
ctx.ServerError("Failed to create zip file", err)
return
}
f, err = zipWriter.CreateHeader(&zip.FileHeader{Name: "goroutine-after.txt", Method: zip.Deflate, Modified: time.Now()})
if err != nil {
ctx.ServerError("Failed to create zip file", err)