From 69dbfdfbc0755edf03be352e62e80ee1bcf68bd6 Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Arango Gutierrez Date: Thu, 14 Mar 2024 15:17:45 +0100 Subject: [PATCH] Use close to signal stop channedl in worker and topology-updater Fix stop channel management on Worker and T-updater in case of multiple callers Signed-off-by: Carlos Eduardo Arango Gutierrez --- pkg/nfd-topology-updater/nfd-topology-updater.go | 5 +---- pkg/nfd-worker/nfd-worker.go | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkg/nfd-topology-updater/nfd-topology-updater.go b/pkg/nfd-topology-updater/nfd-topology-updater.go index 6889f8eb8..0f8095fb8 100644 --- a/pkg/nfd-topology-updater/nfd-topology-updater.go +++ b/pkg/nfd-topology-updater/nfd-topology-updater.go @@ -218,10 +218,7 @@ func (w *nfdTopologyUpdater) Run() error { // Stop NFD Topology Updater func (w *nfdTopologyUpdater) Stop() { - select { - case w.stop <- struct{}{}: - default: - } + close(w.stop) } func (w *nfdTopologyUpdater) updateNodeResourceTopology(zoneInfo v1alpha2.ZoneList, scanResponse resourcemonitor.ScanResponse, readKubeletConfig bool) error { diff --git a/pkg/nfd-worker/nfd-worker.go b/pkg/nfd-worker/nfd-worker.go index 99ee50859..b86b3a888 100644 --- a/pkg/nfd-worker/nfd-worker.go +++ b/pkg/nfd-worker/nfd-worker.go @@ -303,10 +303,7 @@ func (w *nfdWorker) Run() error { // Stop NfdWorker func (w *nfdWorker) Stop() { - select { - case w.stop <- struct{}{}: - default: - } + close(w.stop) } // getGrpcClient returns client connection to the NFD gRPC server. It creates a