From f337511ba57e61305457e88aec1d09eddf94200f Mon Sep 17 00:00:00 2001 From: mochizuki875 Date: Wed, 5 Jul 2023 14:51:15 +0900 Subject: [PATCH 1/3] Add probe triggered log --- pkg/kubelet/prober/worker.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/kubelet/prober/worker.go b/pkg/kubelet/prober/worker.go index ea2d7243387..54aa1cad8fe 100644 --- a/pkg/kubelet/prober/worker.go +++ b/pkg/kubelet/prober/worker.go @@ -178,7 +178,10 @@ probeLoop: case <-w.stopCh: break probeLoop case <-probeTicker.C: + klog.V(3).InfoS("Triggerd Probe by periodSeconds", "probeType", w.probeType, "pod", klog.KObj(w.pod), "podUID", w.pod.UID, "containerName", w.container.Name) + // continue case <-w.manualTriggerCh: + klog.V(3).InfoS("Triggerd Probe by manual run", "probeType", w.probeType, "pod", klog.KObj(w.pod), "podUID", w.pod.UID, "containerName", w.container.Name) // continue } } From b3f9f1682f597816523ed7a29dc1fc4191e54a3e Mon Sep 17 00:00:00 2001 From: mochizuki875 Date: Fri, 30 Aug 2024 06:50:58 +0000 Subject: [PATCH 2/3] shift the periodics timer --- pkg/kubelet/prober/worker.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/prober/worker.go b/pkg/kubelet/prober/worker.go index 54aa1cad8fe..be886525eb8 100644 --- a/pkg/kubelet/prober/worker.go +++ b/pkg/kubelet/prober/worker.go @@ -178,10 +178,13 @@ probeLoop: case <-w.stopCh: break probeLoop case <-probeTicker.C: - klog.V(3).InfoS("Triggerd Probe by periodSeconds", "probeType", w.probeType, "pod", klog.KObj(w.pod), "podUID", w.pod.UID, "containerName", w.container.Name) + klog.V(4).InfoS("Triggerd Probe by periodSeconds", "probeType", w.probeType, "pod", klog.KObj(w.pod), "podUID", w.pod.UID, "containerName", w.container.Name) // continue case <-w.manualTriggerCh: - klog.V(3).InfoS("Triggerd Probe by manual run", "probeType", w.probeType, "pod", klog.KObj(w.pod), "podUID", w.pod.UID, "containerName", w.container.Name) + // Updating the periodic timer to run the probe again at intervals of probeTickerPeriod + // starting from the moment a manual run occurs. + probeTicker.Reset(probeTickerPeriod) + klog.V(4).InfoS("Triggerd Probe by manual run", "probeType", w.probeType, "pod", klog.KObj(w.pod), "podUID", w.pod.UID, "containerName", w.container.Name) // continue } } From 6191fb8a299c717a18b0b4f69917a22247c7e012 Mon Sep 17 00:00:00 2001 From: mochizuki875 Date: Fri, 30 Aug 2024 14:36:07 +0000 Subject: [PATCH 3/3] remove probeTicker log --- pkg/kubelet/prober/worker.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/kubelet/prober/worker.go b/pkg/kubelet/prober/worker.go index be886525eb8..6ff073e5e55 100644 --- a/pkg/kubelet/prober/worker.go +++ b/pkg/kubelet/prober/worker.go @@ -178,7 +178,6 @@ probeLoop: case <-w.stopCh: break probeLoop case <-probeTicker.C: - klog.V(4).InfoS("Triggerd Probe by periodSeconds", "probeType", w.probeType, "pod", klog.KObj(w.pod), "podUID", w.pod.UID, "containerName", w.container.Name) // continue case <-w.manualTriggerCh: // Updating the periodic timer to run the probe again at intervals of probeTickerPeriod