fix

alibaba · Jan 6, 2025 · 2cb4b7b · 2cb4b7b
1 parent 3b27c1b
commit 2cb4b7b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/core/host_monitor/HostMonitorInputRunner.cpp b/core/host_monitor/HostMonitorInputRunner.cpp
@@ -16,6 +16,8 @@
 
 #include "HostMonitorInputRunner.h"
 
+#include <chrono>
+
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
@@ -100,13 +102,14 @@ bool HostMonitorInputRunner::HasRegisteredPlugins() const {
     return false;
 }
 
-bool HostMonitorInputRunner::IsCollectTaskValid(const std::string& collectorName) {
+bool HostMonitorInputRunner::IsCollectTaskValid(std::chrono::steady_clock::time_point execTime,
+                                                const std::string& collectorName) {
     std::shared_lock lock(mRegisteredCollectorMapMutex);
     auto it = mRegisteredCollectorMap.find(collectorName);
     if (it == mRegisteredCollectorMap.end()) {
         return false;
     }
-    return it->second.IsEnabled();
+    return it->second.IsEnabled() && (it->second.mLastEnableTime <= execTime);
 }
 
 void HostMonitorInputRunner::ScheduleOnce(std::chrono::steady_clock::time_point execTime,

diff --git a/core/host_monitor/HostMonitorInputRunner.h b/core/host_monitor/HostMonitorInputRunner.h
@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <chrono>
+
 #include <atomic>
 #include <memory>
 #include <shared_mutex>
@@ -40,10 +42,14 @@ struct CollectorInstance {
 
     std::unique_ptr<BaseCollector> mCollector;
     bool mIsEnabled = false;
+    std::chrono::steady_clock::time_point mLastEnableTime;
 
     BaseCollector* GetCollector() const { return mCollector.get(); }
     bool IsEnabled() const { return mIsEnabled; }
-    void Enable() { mIsEnabled = true; }
+    void Enable() {
+        mIsEnabled = true;
+        mLastEnableTime = std::chrono::steady_clock::now();
+    }
     void Disable() { mIsEnabled = false; }
 };
 
@@ -67,7 +73,7 @@ class HostMonitorInputRunner : public InputRunner {
     void Stop() override;
     bool HasRegisteredPlugins() const override;
 
-    bool IsCollectTaskValid(const std::string& collectorName);
+    bool IsCollectTaskValid(std::chrono::steady_clock::time_point execTime, const std::string& collectorName);
     void ScheduleOnce(std::chrono::steady_clock::time_point execTime,
                       HostMonitorTimerEvent::CollectConfig& collectConfig);
 

diff --git a/core/host_monitor/HostMonitorTimerEvent.cpp b/core/host_monitor/HostMonitorTimerEvent.cpp
@@ -22,7 +22,7 @@
 namespace logtail {
 
 bool HostMonitorTimerEvent::IsValid() const {
-    return HostMonitorInputRunner::GetInstance()->IsCollectTaskValid(mCollectConfig.mCollectorName);
+    return HostMonitorInputRunner::GetInstance()->IsCollectTaskValid(GetExecTime(), mCollectConfig.mCollectorName);
 }
 
 bool HostMonitorTimerEvent::Execute() {

diff --git a/core/unittest/host_monitor/HostMonitorInputRunnerUnittest.cpp b/core/unittest/host_monitor/HostMonitorInputRunnerUnittest.cpp
@@ -53,11 +53,13 @@ void HostMonitorInputRunnerUnittest::TestUpdateAndRemoveCollector() const {
     auto runner = HostMonitorInputRunner::GetInstance();
     runner->Init();
     runner->UpdateCollector({MockCollector::sName}, QueueKey{}, 0);
-    APSARA_TEST_TRUE_FATAL(runner->IsCollectTaskValid(MockCollector::sName));
+    APSARA_TEST_TRUE_FATAL(runner->IsCollectTaskValid(std::chrono::steady_clock::now(), MockCollector::sName));
+    APSARA_TEST_FALSE_FATAL(
+        runner->IsCollectTaskValid(std::chrono::steady_clock::now() - std::chrono::seconds(60), MockCollector::sName));
     APSARA_TEST_TRUE_FATAL(runner->HasRegisteredPlugins());
     APSARA_TEST_EQUAL_FATAL(1, Timer::GetInstance()->mQueue.size());
     runner->RemoveCollector();
-    APSARA_TEST_FALSE_FATAL(runner->IsCollectTaskValid(MockCollector::sName));
+    APSARA_TEST_FALSE_FATAL(runner->IsCollectTaskValid(std::chrono::steady_clock::now(), MockCollector::sName));
     APSARA_TEST_FALSE_FATAL(runner->HasRegisteredPlugins());
     runner->Stop();
 }