-
-
Notifications
You must be signed in to change notification settings - Fork 5.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improve queue & process & stacktrace #24636
Merged
+387
−228
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
8da6db1
improve
wxiaoguang 7f55ed6
Update routers/web/admin/diagnosis.go
wxiaoguang 6554f18
Update routers/web/admin/stacktrace.go
wxiaoguang 330fb2a
Merge branch 'main' into improve-queue
GiteaBot 3583057
Merge branch 'main' into improve-queue
GiteaBot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| // Copyright 2023 The Gitea Authors. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| package admin | ||
|
|
||
| import ( | ||
| "archive/zip" | ||
| "fmt" | ||
| "runtime/pprof" | ||
| "time" | ||
|
|
||
| "code.gitea.io/gitea/modules/context" | ||
| "code.gitea.io/gitea/modules/httplib" | ||
| ) | ||
|
|
||
| func MonitorDiagnosis(ctx *context.Context) { | ||
| seconds := ctx.FormInt64("seconds") | ||
| if seconds <= 5 { | ||
| seconds = 5 | ||
| } | ||
| if seconds > 300 { | ||
| seconds = 300 | ||
| } | ||
|
|
||
| httplib.ServeSetHeaders(ctx.Resp, &httplib.ServeHeaderOptions{ | ||
| ContentType: "application/zip", | ||
| Disposition: "attachment", | ||
| Filename: fmt.Sprintf("gitea-diagnosis-%s.zip", time.Now().Format("20060102-150405")), | ||
| }) | ||
|
|
||
| zipWriter := zip.NewWriter(ctx.Resp) | ||
| defer zipWriter.Close() | ||
|
|
||
| f, err := zipWriter.CreateHeader(&zip.FileHeader{Name: "goroutine-before.txt", Method: zip.Deflate, Modified: time.Now()}) | ||
| if err != nil { | ||
| ctx.ServerError("Failed to create zip file", err) | ||
| return | ||
| } | ||
| _ = pprof.Lookup("goroutine").WriteTo(f, 1) | ||
|
|
||
| f, err = zipWriter.CreateHeader(&zip.FileHeader{Name: "cpu-profile.dat", Method: zip.Deflate, Modified: time.Now()}) | ||
| if err != nil { | ||
| ctx.ServerError("Failed to create zip file", err) | ||
| return | ||
| } | ||
|
|
||
| err = pprof.StartCPUProfile(f) | ||
| if err == nil { | ||
| time.Sleep(time.Duration(seconds) * time.Second) | ||
| pprof.StopCPUProfile() | ||
| } else { | ||
| _, _ = f.Write([]byte(err.Error())) | ||
| } | ||
|
|
||
| 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) | ||
| return | ||
| } | ||
| _ = pprof.Lookup("goroutine").WriteTo(f, 1) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // Copyright 2023 The Gitea Authors. All rights reserved. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| package admin | ||
|
|
||
| import ( | ||
| gocontext "context" | ||
| "sync" | ||
| "time" | ||
|
|
||
| "code.gitea.io/gitea/modules/graceful" | ||
| "code.gitea.io/gitea/modules/log" | ||
| "code.gitea.io/gitea/modules/queue" | ||
| "code.gitea.io/gitea/modules/setting" | ||
| ) | ||
|
|
||
| var testQueueOnce sync.Once | ||
|
|
||
| // initTestQueueOnce initializes the test queue for dev mode | ||
| // the test queue will also be shown in the queue list | ||
| // developers could see the queue length / worker number / items number on the admin page and try to remove the items | ||
| func initTestQueueOnce() { | ||
| testQueueOnce.Do(func() { | ||
| qs := setting.QueueSettings{ | ||
| Name: "test-queue", | ||
| Type: "channel", | ||
| Length: 20, | ||
| BatchLength: 2, | ||
| MaxWorkers: 3, | ||
| } | ||
| testQueue, err := queue.NewWorkerPoolQueueBySetting("test-queue", qs, func(t ...int64) (unhandled []int64) { | ||
| for range t { | ||
| select { | ||
| case <-graceful.GetManager().ShutdownContext().Done(): | ||
| case <-time.After(5 * time.Second): | ||
| } | ||
| } | ||
| return nil | ||
| }, true) | ||
| if err != nil { | ||
| log.Error("unable to create test queue: %v", err) | ||
| return | ||
| } | ||
|
|
||
| queue.GetManager().AddManagedQueue(testQueue) | ||
| testQueue.SetWorkerMaxNumber(5) | ||
| go graceful.GetManager().RunWithShutdownFns(testQueue.Run) | ||
| go graceful.GetManager().RunWithShutdownContext(func(ctx gocontext.Context) { | ||
| cnt := int64(0) | ||
| adding := true | ||
| for { | ||
| select { | ||
| case <-ctx.Done(): | ||
| case <-time.After(500 * time.Millisecond): | ||
| if adding { | ||
| if testQueue.GetQueueItemNumber() == qs.Length { | ||
| adding = false | ||
| } | ||
| } else { | ||
| if testQueue.GetQueueItemNumber() == 0 { | ||
| adding = true | ||
| } | ||
| } | ||
| if adding { | ||
| _ = testQueue.Push(cnt) | ||
| cnt++ | ||
| } | ||
| } | ||
| } | ||
| }) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| // Copyright 2023 The Gitea Authors. All rights reserved. | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| package admin | ||
|
|
||
| import ( | ||
| "net/http" | ||
| "runtime" | ||
|
|
||
| "code.gitea.io/gitea/modules/context" | ||
| "code.gitea.io/gitea/modules/process" | ||
| "code.gitea.io/gitea/modules/setting" | ||
| ) | ||
|
|
||
| // Stacktrace show admin monitor goroutines page | ||
| func Stacktrace(ctx *context.Context) { | ||
| ctx.Data["Title"] = ctx.Tr("admin.monitor") | ||
| ctx.Data["PageIsAdminMonitorStacktrace"] = true | ||
|
|
||
| ctx.Data["GoroutineCount"] = runtime.NumGoroutine() | ||
|
|
||
| show := ctx.FormString("show") | ||
| ctx.Data["ShowGoroutineList"] = show | ||
| // by default, do not do anything which might cause server errors, to avoid unnecessary 500 pages. | ||
| // this page is the entrance of the chance to collect diagnosis report. | ||
| if show != "" { | ||
wxiaoguang marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| showNoSystem := show == "process" | ||
| processStacks, processCount, _, err := process.GetManager().ProcessStacktraces(false, showNoSystem) | ||
| if err != nil { | ||
| ctx.ServerError("GoroutineStacktrace", err) | ||
| return | ||
| } | ||
|
|
||
| ctx.Data["ProcessStacks"] = processStacks | ||
| ctx.Data["ProcessCount"] = processCount | ||
| } | ||
|
|
||
| ctx.HTML(http.StatusOK, tplStacktrace) | ||
| } | ||
|
|
||
| // StacktraceCancel cancels a process | ||
| func StacktraceCancel(ctx *context.Context) { | ||
| pid := ctx.Params("pid") | ||
| process.GetManager().Cancel(process.IDType(pid)) | ||
| ctx.JSON(http.StatusOK, map[string]interface{}{ | ||
| "redirect": setting.AppSubURL + "/admin/monitor/stacktrace", | ||
| }) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,39 @@ | ||
| <h4 class="ui top attached header"> | ||
| {{.locale.Tr "admin.monitor.cron"}} | ||
| </h4> | ||
| <div class="ui attached table segment"> | ||
| <form method="post" action="{{AppSubUrl}}/admin"> | ||
| <table class="ui very basic striped table unstackable"> | ||
| <thead> | ||
| <tr> | ||
| <th></th> | ||
| <th>{{.locale.Tr "admin.monitor.name"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.schedule"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.next"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.previous"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.execute_times"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.last_execution_result"}}</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {{range .Entries}} | ||
| {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} | ||
| <div class="admin-setting-content"> | ||
| <h4 class="ui top attached header"> | ||
| {{.locale.Tr "admin.monitor.cron"}} | ||
| </h4> | ||
| <div class="ui attached table segment"> | ||
| <form method="post" action="{{AppSubUrl}}/admin"> | ||
| <table class="ui very basic striped table unstackable"> | ||
| <thead> | ||
| <tr> | ||
| <td><button type="submit" class="ui green button" name="op" value="{{.Name}}" title="{{$.locale.Tr "admin.dashboard.operation_run"}}">{{svg "octicon-triangle-right"}}</button></td> | ||
| <td>{{$.locale.Tr (printf "admin.dashboard.%s" .Name)}}</td> | ||
| <td>{{.Spec}}</td> | ||
| <td>{{DateTime "full" .Next}}</td> | ||
| <td>{{if gt .Prev.Year 1}}{{DateTime "full" .Prev}}{{else}}-{{end}}</td> | ||
| <td>{{.ExecTimes}}</td> | ||
| <td {{if ne .Status ""}}data-tooltip-content="{{.FormatLastMessage $.locale}}"{{end}} >{{if eq .Status ""}}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}}</td> | ||
| <th></th> | ||
| <th>{{.locale.Tr "admin.monitor.name"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.schedule"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.next"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.previous"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.execute_times"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.last_execution_result"}}</th> | ||
| </tr> | ||
| {{end}} | ||
| </tbody> | ||
| </table> | ||
| <input type="hidden" name="from" value="monitor"> | ||
| {{.CsrfTokenHtml}} | ||
| </form> | ||
| </thead> | ||
| <tbody> | ||
| {{range .Entries}} | ||
| <tr> | ||
| <td><button type="submit" class="ui green button" name="op" value="{{.Name}}" title="{{$.locale.Tr "admin.dashboard.operation_run"}}">{{svg "octicon-triangle-right"}}</button></td> | ||
| <td>{{$.locale.Tr (printf "admin.dashboard.%s" .Name)}}</td> | ||
| <td>{{.Spec}}</td> | ||
| <td>{{DateTime "full" .Next}}</td> | ||
| <td>{{if gt .Prev.Year 1}}{{DateTime "full" .Prev}}{{else}}-{{end}}</td> | ||
| <td>{{.ExecTimes}}</td> | ||
| <td {{if ne .Status ""}}data-tooltip-content="{{.FormatLastMessage $.locale}}"{{end}} >{{if eq .Status ""}}—{{else if eq .Status "finished"}}{{svg "octicon-check" 16}}{{else}}{{svg "octicon-x" 16}}{{end}}</td> | ||
| </tr> | ||
| {{end}} | ||
| </tbody> | ||
| </table> | ||
| <input type="hidden" name="from" value="monitor"> | ||
| {{.CsrfTokenHtml}} | ||
| </form> | ||
| </div> | ||
| </div> | ||
| {{template "admin/layout_footer" .}} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,34 @@ | ||
| <h4 class="ui top attached header"> | ||
| {{.locale.Tr "admin.monitor.queues"}} | ||
| </h4> | ||
| <div class="ui attached table segment"> | ||
| <table class="ui very basic striped table unstackable"> | ||
| <thead> | ||
| <tr> | ||
| <th>{{.locale.Tr "admin.monitor.queue.name"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.queue.type"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th> | ||
| <th></th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {{range $qid, $q := .Queues}} | ||
| <tr> | ||
| <td>{{$q.GetName}}</td> | ||
| <td>{{$q.GetType}}</td> | ||
| <td>{{$q.GetItemTypeName}}</td> | ||
| <td>{{$sum := $q.GetWorkerNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td> | ||
| <td>{{$sum = $q.GetQueueItemNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td> | ||
| <td><a href="{{$.Link}}/queue/{{$qid}}" class="button">{{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}}</a> | ||
| </tr> | ||
| {{end}} | ||
| </tbody> | ||
| </table> | ||
| {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} | ||
| <div class="admin-setting-content"> | ||
| <h4 class="ui top attached header"> | ||
| {{.locale.Tr "admin.monitor.queues"}} | ||
| </h4> | ||
| <div class="ui attached table segment"> | ||
| <table class="ui very basic striped table unstackable"> | ||
| <thead> | ||
| <tr> | ||
| <th>{{.locale.Tr "admin.monitor.queue.name"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.queue.type"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th> | ||
| <th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th> | ||
| <th></th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {{range $qid, $q := .Queues}} | ||
| <tr> | ||
| <td>{{$q.GetName}}</td> | ||
| <td>{{$q.GetType}}</td> | ||
| <td>{{$q.GetItemTypeName}}</td> | ||
| <td>{{$sum := $q.GetWorkerNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td> | ||
| <td>{{$sum = $q.GetQueueItemNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td> | ||
| <td><a href="{{$.Link}}/{{$qid}}" class="button">{{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}}</a> | ||
| </tr> | ||
| {{end}} | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| </div> | ||
| {{template "admin/layout_footer" .}} | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll store this code in my quiver 😁
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hopefully we never need such code 🤣 , no bug, no use