mirrors/node-feature-discovery
mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-16 21:38:23 +00:00
Code Activity

Merge pull request #941 from k8s-infra-cherrypick-robot/cherry-pick-929-to-release-0.11

Browse source 
[release-0.11] topology-updater: continue looping on scan error
This commit is contained in:
Kubernetes Prow Robot 2022-10-31 05:18:44 -07:00 • committed by GitHub
commit f796e2add6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/nfd-client/topology-updater/nfd-topology-updater.go
View file

@ -126,15 +126,15 @@ func (w *nfdTopologyUpdater) Run() error {
return err return err
} }
crTrigger := time.After(0) crTrigger := time.NewTicker(w.resourcemonitorArgs.SleepInterval)
for { for {
select { select {
case <-crTrigger: case <-crTrigger.C:
klog.Infof("Scanning\n") klog.Infof("Scanning")
podResources, err := resScan.Scan() podResources, err := resScan.Scan()
utils.KlogDump(1, "podResources are", " ", podResources) utils.KlogDump(1, "podResources are", " ", podResources)
if err != nil { if err != nil {
klog.Warningf("Scan failed: %v\n", err) klog.Warningf("Scan failed: %v", err)
continue continue
} }
zones = resAggr.Aggregate(podResources) zones = resAggr.Aggregate(podResources)
@ -147,10 +147,6 @@ func (w *nfdTopologyUpdater) Run() error {
return nil return nil
} }
if w.resourcemonitorArgs.SleepInterval > 0 {
crTrigger = time.After(w.resourcemonitorArgs.SleepInterval)
}
case <-w.certWatch.Events: case <-w.certWatch.Events:
klog.Infof("TLS certificate update, renewing connection to nfd-master") klog.Infof("TLS certificate update, renewing connection to nfd-master")
w.Disconnect() w.Disconnect()