github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98200 from wzshiming/fix-node-shutdown-events

Browse Source 
Fix kubelet from panic after getting the wrong signal
This commit is contained in:
Kubernetes Prow Robot 2021-01-20 10:38:47 -08:00 committed by GitHub
commit 737858cd7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/nodeshutdown/systemd/inhibit_linux.go
View File

@ -142,11 +142,12 @@ func (bus *DBusCon) MonitorShutdown() (<-chan bool, error) {
case event := <-busChan: case event := <-busChan:
if event == nil || len(event.Body) == 0 { if event == nil || len(event.Body) == 0 {
klog.Errorf("Failed obtaining shutdown event, PrepareForShutdown event was empty") klog.Errorf("Failed obtaining shutdown event, PrepareForShutdown event was empty")
continue
} }
shutdownActive, ok := event.Body[0].(bool) shutdownActive, ok := event.Body[0].(bool)
if !ok { if !ok {
klog.Errorf("Failed obtaining shutdown event, PrepareForShutdown event was not bool type as expected") klog.Errorf("Failed obtaining shutdown event, PrepareForShutdown event was not bool type as expected")
return continue
} }
shutdownChan <- shutdownActive shutdownChan <- shutdownActive
} }