Skip to content

Commit 4790962

Browse files
authored
Merge pull request #1595 from marquiz/devel/master-check-node-existence
nfd-master: check if node exists before trying update
2 parents 797fada + a7bd22a commit 4790962

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

pkg/nfd-master/node-updater-pool.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"time"
2222

2323
"golang.org/x/time/rate"
24+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2425
"k8s.io/client-go/util/workqueue"
2526
"k8s.io/klog/v2"
2627
)
@@ -41,15 +42,20 @@ func newNodeUpdaterPool(nfdMaster *nfdMaster) *nodeUpdaterPool {
4142
}
4243

4344
func (u *nodeUpdaterPool) processNodeUpdateRequest(queue workqueue.RateLimitingInterface) bool {
44-
nodeName, quit := queue.Get()
45+
n, quit := queue.Get()
4546
if quit {
4647
return false
4748
}
49+
nodeName := n.(string)
4850

4951
defer queue.Done(nodeName)
5052

5153
nodeUpdateRequests.Inc()
52-
if err := u.nfdMaster.nfdAPIUpdateOneNode(nodeName.(string)); err != nil {
54+
55+
// Check if node exists
56+
if _, err := u.nfdMaster.getNode(nodeName); apierrors.IsNotFound(err) {
57+
klog.InfoS("node not found, skip update", "nodeName", nodeName)
58+
} else if err := u.nfdMaster.nfdAPIUpdateOneNode(nodeName); err != nil {
5359
if queue.NumRequeues(nodeName) < 15 {
5460
klog.InfoS("retrying node update", "nodeName", nodeName, "lastError", err)
5561
queue.AddRateLimited(nodeName)

0 commit comments

Comments
 (0)