Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c24ef49c
Commit
c24ef49c
authored
Sep 15, 2015
by
Mike Danese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
only log when we are actually cancelling an eviction in the node controller
parent
9ae90d21
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
nodecontroller.go
pkg/controller/node/nodecontroller.go
+5
-2
No files found.
pkg/controller/node/nodecontroller.go
View file @
c24ef49c
...
@@ -571,12 +571,15 @@ func (nc *NodeController) evictPods(nodeName string) bool {
...
@@ -571,12 +571,15 @@ func (nc *NodeController) evictPods(nodeName string) bool {
// cancelPodEviction removes any queued evictions, typically because the node is available again. It
// cancelPodEviction removes any queued evictions, typically because the node is available again. It
// returns true if an eviction was queued.
// returns true if an eviction was queued.
func
(
nc
*
NodeController
)
cancelPodEviction
(
nodeName
string
)
bool
{
func
(
nc
*
NodeController
)
cancelPodEviction
(
nodeName
string
)
bool
{
glog
.
V
(
2
)
.
Infof
(
"Cancelling pod Eviction on Node: %v"
,
nodeName
)
nc
.
evictorLock
.
Lock
()
nc
.
evictorLock
.
Lock
()
defer
nc
.
evictorLock
.
Unlock
()
defer
nc
.
evictorLock
.
Unlock
()
wasDeleting
:=
nc
.
podEvictor
.
Remove
(
nodeName
)
wasDeleting
:=
nc
.
podEvictor
.
Remove
(
nodeName
)
wasTerminating
:=
nc
.
terminationEvictor
.
Remove
(
nodeName
)
wasTerminating
:=
nc
.
terminationEvictor
.
Remove
(
nodeName
)
return
wasDeleting
||
wasTerminating
if
wasDeleting
||
wasTerminating
{
glog
.
V
(
2
)
.
Infof
(
"Cancelling pod Eviction on Node: %v"
,
nodeName
)
return
true
}
return
false
}
}
// deletePods will delete all pods from master running on given node, and return true
// deletePods will delete all pods from master running on given node, and return true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment