github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Avoid duplicated dots in pod condition

Browse Source 
Signed-off-by: kerthcet <kerthcet@gmail.com>
This commit is contained in:
kerthcet 2023-08-28 22:36:36 +08:00
parent 3d583398fe
commit 580f83ab4a
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/scheduler/framework/types.go
View File

@ -307,8 +307,6 @@ type FitError struct {
const ( const (
// NoNodeAvailableMsg is used to format message when no nodes available. // NoNodeAvailableMsg is used to format message when no nodes available.
NoNodeAvailableMsg = "0/%v nodes are available" NoNodeAvailableMsg = "0/%v nodes are available"
// SeparatorFormat is used to separate PreFilterMsg, FilterMsg and PostFilterMsg.
SeparatorFormat = " %v."
) )
// Error returns detailed information of why the pod failed to fit on each node. // Error returns detailed information of why the pod failed to fit on each node.
@ -319,7 +317,7 @@ func (f *FitError) Error() string {
if preFilterMsg != "" { if preFilterMsg != "" {
// PreFilter plugin returns unschedulable. // PreFilter plugin returns unschedulable.
// Add the messages from PreFilter plugins to reasonMsg. // Add the messages from PreFilter plugins to reasonMsg.
reasonMsg += fmt.Sprintf(SeparatorFormat, preFilterMsg) reasonMsg += fmt.Sprintf(" %v.", preFilterMsg)
} }
if preFilterMsg == "" { if preFilterMsg == "" {
@ -346,7 +344,7 @@ func (f *FitError) Error() string {
} }
sortedFilterMsg := sortReasonsHistogram() sortedFilterMsg := sortReasonsHistogram()
if len(sortedFilterMsg) != 0 { if len(sortedFilterMsg) != 0 {
reasonMsg += fmt.Sprintf(SeparatorFormat, strings.Join(sortedFilterMsg, ", ")) reasonMsg += fmt.Sprintf(" %v.", strings.Join(sortedFilterMsg, ", "))
} }
} }
@ -355,9 +353,8 @@ func (f *FitError) Error() string {
// since we may run PostFilter (if enabled) in both cases. // since we may run PostFilter (if enabled) in both cases.
postFilterMsg := f.Diagnosis.PostFilterMsg postFilterMsg := f.Diagnosis.PostFilterMsg
if postFilterMsg != "" { if postFilterMsg != "" {
reasonMsg += fmt.Sprintf(SeparatorFormat, postFilterMsg) reasonMsg += fmt.Sprintf(" %v", postFilterMsg)
} }
return reasonMsg return reasonMsg
} }

6
pkg/scheduler/framework/types_test.go
View File

@ -1415,7 +1415,7 @@ func TestFitError_Error(t *testing.T) {
// PostFilterMsg will be included. // PostFilterMsg will be included.
PostFilterMsg: "Error running PostFilter plugin FailedPostFilter", PostFilterMsg: "Error running PostFilter plugin FailedPostFilter",
}, },
wantReasonMsg: "0/3 nodes are available: Node(s) failed PreFilter plugin FalsePreFilter. Error running PostFilter plugin FailedPostFilter.", wantReasonMsg: "0/3 nodes are available: Node(s) failed PreFilter plugin FalsePreFilter. Error running PostFilter plugin FailedPostFilter",
}, },
{ {
name: "nodes failed one Filter plugin with an empty PostFilterMsg", name: "nodes failed one Filter plugin with an empty PostFilterMsg",
@ -1442,7 +1442,7 @@ func TestFitError_Error(t *testing.T) {
}, },
PostFilterMsg: "Error running PostFilter plugin FailedPostFilter", PostFilterMsg: "Error running PostFilter plugin FailedPostFilter",
}, },
wantReasonMsg: "0/3 nodes are available: 3 Node(s) failed Filter plugin FalseFilter-1. Error running PostFilter plugin FailedPostFilter.", wantReasonMsg: "0/3 nodes are available: 3 Node(s) failed Filter plugin FalseFilter-1. Error running PostFilter plugin FailedPostFilter",
}, },
{ {
name: "nodes failed two Filter plugins with an empty PostFilterMsg", name: "nodes failed two Filter plugins with an empty PostFilterMsg",
@ -1469,7 +1469,7 @@ func TestFitError_Error(t *testing.T) {
}, },
PostFilterMsg: "Error running PostFilter plugin FailedPostFilter", PostFilterMsg: "Error running PostFilter plugin FailedPostFilter",
}, },
wantReasonMsg: "0/3 nodes are available: 1 Node(s) failed Filter plugin FalseFilter-2, 2 Node(s) failed Filter plugin FalseFilter-1. Error running PostFilter plugin FailedPostFilter.", wantReasonMsg: "0/3 nodes are available: 1 Node(s) failed Filter plugin FalseFilter-2, 2 Node(s) failed Filter plugin FalseFilter-1. Error running PostFilter plugin FailedPostFilter",
}, },
{ {
name: "failed to Permit on node", name: "failed to Permit on node",