-
Notifications
You must be signed in to change notification settings - Fork 436
cubemastercli: extend default --probe budget for slower hosts #97
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
Open
ishswar
wants to merge
1
commit into
TencentCloud:master
Choose a base branch
from
ishswar:cubemastercli/extend-probe-budget
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+15
−4
Open
Changes from all commits
Commits
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 hidden or 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 |
|---|---|---|
|
|
@@ -766,8 +766,9 @@ var TemplateCreateFromImageCommand = cli.Command{ | |
| cli.StringSliceFlag{Name: "arg", Usage: "override container CMD (args); repeat for multiple elements"}, | ||
| cli.StringSliceFlag{Name: "env", Usage: "set environment variable, KEY=VALUE format; repeat for multiple envs"}, | ||
| cli.StringSliceFlag{Name: "dns", Usage: "set container DNS nameserver; repeat for multiple servers"}, | ||
| cli.IntFlag{Name: "probe", Usage: "enable HTTP GET probe on the specified port (e.g. --probe 9000); sets timeout_ms=30000, period_ms=500"}, | ||
| cli.IntFlag{Name: "probe", Usage: "enable HTTP GET probe on the specified port (e.g. --probe 9000); see --probe-timeout, --probe-path"}, | ||
| cli.StringFlag{Name: "probe-path", Value: "/health", Usage: "HTTP path for the readiness probe (default: /health); only effective when --probe is set"}, | ||
| cli.DurationFlag{Name: "probe-timeout", Value: 120 * time.Second, Usage: "total probe wall-clock budget (e.g. 30s, 2m); only effective when --probe is set; default 120s suits nested-KVM hosts where the in-guest application takes longer than 30s to bind the probe port"}, | ||
| cli.IntFlag{Name: "cpu", Value: 2000, Usage: "CPU millicores for the template container (default: 2000, i.e. 2 cores)"}, | ||
| cli.IntFlag{Name: "memory", Value: 2000, Usage: "Memory for the template container in MB (default: 2000 MB)"}, | ||
| cli.BoolFlag{Name: "json", Usage: "print raw json response"}, | ||
|
|
@@ -1315,6 +1316,16 @@ func parseContainerOverrides(c *cli.Context) (*types.ContainerOverrides, error) | |
| if probePath == "" { | ||
| probePath = "/health" | ||
| } | ||
| probeTimeout := c.Duration("probe-timeout") | ||
| if probeTimeout < time.Second { | ||
| return nil, fmt.Errorf("--probe-timeout must be at least 1s, got %s", probeTimeout) | ||
| } | ||
| // PeriodMs is fixed at 1s; FailureThreshold derives from the requested | ||
| // total budget (rounded up to whole seconds). TimeoutMs == total budget | ||
| // so it never trips before FailureThreshold does. | ||
| periodMs := int32(1000) | ||
| timeoutMs := int32(probeTimeout.Milliseconds()) | ||
| failureThreshold := int32((probeTimeout + time.Second - 1) / time.Second) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You've checked probeTimeout above, so you can just do: failureThreshold := int32(probeTimeout / time.Second)
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @ishswar Could you please address the suggestions and update the PR? |
||
| host := "" | ||
| overrides.Probe = &types.Probe{ | ||
| ProbeHandler: &types.ProbeHandler{ | ||
|
|
@@ -1324,9 +1335,9 @@ func parseContainerOverrides(c *cli.Context) (*types.ContainerOverrides, error) | |
| Host: &host, | ||
| }, | ||
| }, | ||
| TimeoutMs: 30000, | ||
| PeriodMs: 500, | ||
| FailureThreshold: 60, | ||
| TimeoutMs: timeoutMs, | ||
| PeriodMs: periodMs, | ||
| FailureThreshold: failureThreshold, | ||
| SuccessThreshold: 1, | ||
| } | ||
| } | ||
|
|
||
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.
Use
Milliseconds()method.