forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Queue: Make WorkerPools and Queues flushable (go-gitea#10001)
* Make WorkerPools and Queues flushable Adds Flush methods to Queues and the WorkerPool Further abstracts the WorkerPool Adds a final step to Flush the queues in the defer from PrintCurrentTest Fixes an issue with Settings inheritance in queues Signed-off-by: Andrew Thornton <[email protected]> * Change to for loop * Add IsEmpty and begin just making the queues composed WorkerPools * subsume workerpool into the queues and create a flushable interface * Add manager command * Move flushall to queue.Manager and add to testlogger * As per @guillep2k * as per @guillep2k * Just make queues all implement flushable and clean up the wrapped queue flushes * cope with no timeout Co-authored-by: Lauris BH <[email protected]>
- Loading branch information
Showing
27 changed files
with
1,030 additions
and
327 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| // Copyright 2020 The Gitea Authors. All rights reserved. | ||
| // Use of this source code is governed by a MIT-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| package cmd | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/http" | ||
| "os" | ||
| "time" | ||
|
|
||
| "code.gitea.io/gitea/modules/private" | ||
|
|
||
| "github.com/urfave/cli" | ||
| ) | ||
|
|
||
| var ( | ||
| // CmdManager represents the manager command | ||
| CmdManager = cli.Command{ | ||
| Name: "manager", | ||
| Usage: "Manage the running gitea process", | ||
| Description: "This is a command for managing the running gitea process", | ||
| Subcommands: []cli.Command{ | ||
| subcmdShutdown, | ||
| subcmdRestart, | ||
| subcmdFlushQueues, | ||
| }, | ||
| } | ||
| subcmdShutdown = cli.Command{ | ||
| Name: "shutdown", | ||
| Usage: "Gracefully shutdown the running process", | ||
| Action: runShutdown, | ||
| } | ||
| subcmdRestart = cli.Command{ | ||
| Name: "restart", | ||
| Usage: "Gracefully restart the running process - (not implemented for windows servers)", | ||
| Action: runRestart, | ||
| } | ||
| subcmdFlushQueues = cli.Command{ | ||
| Name: "flush-queues", | ||
| Usage: "Flush queues in the running process", | ||
| Action: runFlushQueues, | ||
| Flags: []cli.Flag{ | ||
| cli.DurationFlag{ | ||
| Name: "timeout", | ||
| Value: 60 * time.Second, | ||
| Usage: "Timeout for the flushing process", | ||
| }, | ||
| cli.BoolFlag{ | ||
| Name: "non-blocking", | ||
| Usage: "Set to true to not wait for flush to complete before returning", | ||
| }, | ||
| }, | ||
| } | ||
| ) | ||
|
|
||
| func runShutdown(c *cli.Context) error { | ||
| setup("manager", false) | ||
| statusCode, msg := private.Shutdown() | ||
| switch statusCode { | ||
| case http.StatusInternalServerError: | ||
| fail("InternalServerError", msg) | ||
| } | ||
|
|
||
| fmt.Fprintln(os.Stdout, msg) | ||
| return nil | ||
| } | ||
|
|
||
| func runRestart(c *cli.Context) error { | ||
| setup("manager", false) | ||
| statusCode, msg := private.Restart() | ||
| switch statusCode { | ||
| case http.StatusInternalServerError: | ||
| fail("InternalServerError", msg) | ||
| } | ||
|
|
||
| fmt.Fprintln(os.Stdout, msg) | ||
| return nil | ||
| } | ||
|
|
||
| func runFlushQueues(c *cli.Context) error { | ||
| setup("manager", false) | ||
| statusCode, msg := private.FlushQueues(c.Duration("timeout"), c.Bool("non-blocking")) | ||
| switch statusCode { | ||
| case http.StatusInternalServerError: | ||
| fail("InternalServerError", msg) | ||
| } | ||
|
|
||
| fmt.Fprintln(os.Stdout, msg) | ||
| return nil | ||
| } |
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,83 @@ | ||
| // Copyright 2020 The Gitea Authors. All rights reserved. | ||
| // Use of this source code is governed by a MIT-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| package private | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "net/http" | ||
| "time" | ||
|
|
||
| "code.gitea.io/gitea/modules/setting" | ||
| ) | ||
|
|
||
| // Shutdown calls the internal shutdown function | ||
| func Shutdown() (int, string) { | ||
| reqURL := setting.LocalURL + fmt.Sprintf("api/internal/manager/shutdown") | ||
|
|
||
| req := newInternalRequest(reqURL, "POST") | ||
| resp, err := req.Response() | ||
| if err != nil { | ||
| return http.StatusInternalServerError, fmt.Sprintf("Unable to contact gitea: %v", err.Error()) | ||
| } | ||
| defer resp.Body.Close() | ||
|
|
||
| if resp.StatusCode != http.StatusOK { | ||
| return resp.StatusCode, decodeJSONError(resp).Err | ||
| } | ||
|
|
||
| return http.StatusOK, "Shutting down" | ||
| } | ||
|
|
||
| // Restart calls the internal restart function | ||
| func Restart() (int, string) { | ||
| reqURL := setting.LocalURL + fmt.Sprintf("api/internal/manager/restart") | ||
|
|
||
| req := newInternalRequest(reqURL, "POST") | ||
| resp, err := req.Response() | ||
| if err != nil { | ||
| return http.StatusInternalServerError, fmt.Sprintf("Unable to contact gitea: %v", err.Error()) | ||
| } | ||
| defer resp.Body.Close() | ||
|
|
||
| if resp.StatusCode != http.StatusOK { | ||
| return resp.StatusCode, decodeJSONError(resp).Err | ||
| } | ||
|
|
||
| return http.StatusOK, "Restarting" | ||
| } | ||
|
|
||
| // FlushOptions represents the options for the flush call | ||
| type FlushOptions struct { | ||
| Timeout time.Duration | ||
| NonBlocking bool | ||
| } | ||
|
|
||
| // FlushQueues calls the internal flush-queues function | ||
| func FlushQueues(timeout time.Duration, nonBlocking bool) (int, string) { | ||
| reqURL := setting.LocalURL + fmt.Sprintf("api/internal/manager/flush-queues") | ||
|
|
||
| req := newInternalRequest(reqURL, "POST") | ||
| if timeout > 0 { | ||
| req.SetTimeout(timeout+10*time.Second, timeout+10*time.Second) | ||
| } | ||
| req = req.Header("Content-Type", "application/json") | ||
| jsonBytes, _ := json.Marshal(FlushOptions{ | ||
| Timeout: timeout, | ||
| NonBlocking: nonBlocking, | ||
| }) | ||
| req.Body(jsonBytes) | ||
| resp, err := req.Response() | ||
| if err != nil { | ||
| return http.StatusInternalServerError, fmt.Sprintf("Unable to contact gitea: %v", err.Error()) | ||
| } | ||
| defer resp.Body.Close() | ||
|
|
||
| if resp.StatusCode != http.StatusOK { | ||
| return resp.StatusCode, decodeJSONError(resp).Err | ||
| } | ||
|
|
||
| return http.StatusOK, "Flushed" | ||
| } |
Oops, something went wrong.