Skip to content
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.

Sign up for GitHub

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

Jump to bottom

remove node out of sync state #2998

Merged
merged 1 commit into from
Jul 28, 2023
Merged

remove node out of sync state #2998

merged 1 commit into from
Jul 28, 2023

Conversation

Monokaix
Copy link
Member

@Monokaix Monokaix commented Jul 26, 2023 •
edited
Loading

Fix #2999

@volcano-sh-bot volcano-sh-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 26, 2023
Thor-wl
Thor-wl reviewed Jul 26, 2023
View reviewed changes
pkg/scheduler/actions/allocate/allocate.go Outdated
@@ -99,8 +99,8 @@ func (alloc *Action) Execute(ssn *framework.Session) {
allNodes := ssn.NodeList
predicateFn := func(task *api.TaskInfo, node *api.NodeInfo) ([]*api.Status, error) {
// Check for Resource Predicate
if ok, reason := task.InitResreq.LessEqualWithReason(node.FutureIdle(), api.Zero); !ok {
return nil, api.NewFitError(task, node, reason)
if ok, resource := task.InitResreq.LessEqualWithResource(node.FutureIdle(), api.Zero); !ok {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Monokaix Hi, I'm kindly asking about the reason or meaning of this PR. After going through all the modifications, I've not getting the meaningful points. It may be better to add descriptions for all PRs.

Copy link
Member Author

@Monokaix Monokaix Jul 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for delay, I have added the related issue.

pkg/scheduler/api/resource_info.go
@@ -418,10 +418,10 @@ func (r *Resource) LessEqualWithReason(rr *Resource, defaultValue DimensionDefau
}

if !lessEqualFunc(r.MilliCPU, rr.MilliCPU, minResource) {
return false, "Insufficient cpu"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest not add any prefix for the resource for this is only a common used tool function. The prefix may narrow the usage.

Copy link
Member Author

@Monokaix Monokaix Jul 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The origin prefix is reason, which is also not common, LessEqual func has many usage, it will cause a big change if we change this func directly.

@Monokaix Monokaix force-pushed the outofsync branch 3 times, most recently from cbe8d0a to b354161 Compare July 27, 2023 06:33
@volcano-sh-bot volcano-sh-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 27, 2023
@Monokaix Monokaix force-pushed the outofsync branch 3 times, most recently from 0482641 to f54816d Compare July 27, 2023 07:08
william-wang
william-wang reviewed Jul 27, 2023
View reviewed changes
pkg/scheduler/api/resource_info.go Outdated
// @param defaultValue "default value for resource dimension not defined in ScalarResources. Its value can only be one of 'Zero' and 'Infinity'"
// this function is the same as LessEqual , and it will be merged to LessEqual in the future
func (r *Resource) LessEqualWithReason(rr *Resource, defaultValue DimensionDefaultValue) (bool, string) {
func (r *Resource) LessEqualWithResources(rr *Resource, defaultValue DimensionDefaultValue) (bool, []string) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to change LessEqualWithResources to LessEqualWithResourceName

pkg/scheduler/api/node_info.go Outdated
func (ni *NodeInfo) allocateIdleResource(ti *TaskInfo) error {
if ti.Resreq.LessEqual(ni.Idle, Zero) {
func (ni *NodeInfo) allocateIdleResource(ti *TaskInfo) {
ok, resources := ti.Resreq.LessEqualWithResources(ni.Idle, Zero)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LessEqualWithResources is similar with lessEqual and will be merged to lessEqual in the future. So here we'd better use LessEqual

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here we want to know what resources are not enough, so LessEqualWithResources is used now.

william-wang
william-wang reviewed Jul 27, 2023
View reviewed changes
pkg/scheduler/api/node_info.go
@@ -372,30 +368,30 @@ func (ni *NodeInfo) setNode(node *v1.Node) {
for _, ti := range ni.Tasks {
switch ti.Status {
case Releasing:
ni.Idle.sub(ti.Resreq) // sub without assertion
ni.allocateIdleResource(ti)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sugguest use common function sub.

william-wang
william-wang reviewed Jul 27, 2023
View reviewed changes
pkg/scheduler/api/node_info.go
ni.Releasing.Add(ti.Resreq)
ni.Used.Add(ti.Resreq)
ni.addResource(ti.Pod)
case Pipelined:
ni.Pipelined.Add(ti.Resreq)
default:
ni.Idle.sub(ti.Resreq) // sub without assertion
ni.allocateIdleResource(ti)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

@Monokaix Monokaix force-pushed the outofsync branch 7 times, most recently from 7a73bfc to 1628980 Compare July 27, 2023 11:49
@Monokaix
remove node out of sync state
728e5e0 
Signed-off-by: Xuzheng Chang <changxuzheng@huawei.com>
william-wang
william-wang approved these changes Jul 28, 2023
View reviewed changes
Copy link
Member

@william-wang william-wang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@volcano-sh-bot volcano-sh-bot added the lgtm Indicates that a PR is ready to be merged. label Jul 28, 2023
@volcano-sh-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: william-wang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@volcano-sh-bot volcano-sh-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 28, 2023
@volcano-sh-bot volcano-sh-bot merged commit 1665e6d into volcano-sh:master Jul 28, 2023
This was referenced Jul 28, 2023
Merged
Closed
@Monokaix Monokaix mentioned this pull request Nov 25, 2023
Closed
@Monokaix Monokaix deleted the outofsync branch January 8, 2024 08:50
@Monokaix Monokaix mentioned this pull request Jan 23, 2024
Open
@Monokaix Monokaix mentioned this pull request May 20, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Thor-wl Thor-wl Thor-wl left review comments

@william-wang william-wang william-wang approved these changes

@k82cn k82cn Awaiting requested review from k82cn

Assignees

@william-wang william-wang

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

node outOfSync state cause deadlock and block pod scheduled
4 participants
@Monokaix @volcano-sh-bot @william-wang @Thor-wl