Start instance monitoring before instance is launched

include/aos/common/monitoring/monitoring.hpp

@@ -115,10 +115,11 @@ struct InstanceMonitoringData {
     {
     }
 
-    InstanceIdent  mInstanceIdent  = {};
-    MonitoringData mMonitoringData = {};
-    uint32_t       mUID            = 0;
-    uint32_t       mGID            = 0;
+    InstanceIdent    mInstanceIdent  = {};
+    MonitoringData   mMonitoringData = {};
+    uint32_t         mUID            = 0;
+    uint32_t         mGID            = 0;
+    InstanceRunState mRunState       = InstanceRunStateEnum::eFailed;
 
     /**
      * Compares instance monitoring data.
@@ -233,6 +234,15 @@ class ResourceMonitorItf {
      */
     virtual Error StartInstanceMonitoring(const String& instanceID, const InstanceMonitorParams& monitoringConfig) = 0;
 
+    /**
+     * Updates instance's run state.
+     *
+     * @param instanceID instance ID.
+     * @param runState run state.
+     * @return Error.
+     */
+    virtual Error UpdateInstanceRunState(const String& instanceID, InstanceRunState runState) = 0;
+
     /**
      * Stops instance monitoring.
      *

include/aos/common/monitoring/resourcemonitor.hpp

@@ -71,6 +71,15 @@ class ResourceMonitor : public ResourceMonitorItf,
      */
     Error StartInstanceMonitoring(const String& instanceID, const InstanceMonitorParams& monitoringConfig) override;
 
+    /**
+     * Updates instance's run state.
+     *
+     * @param instanceID instance ID.
+     * @param runState run state.
+     * @return Error.
+     */
+    Error UpdateInstanceRunState(const String& instanceID, InstanceRunState runState) override;
+
     /**
      * Stops instance monitoring.
      *

src/common/monitoring/resourcemonitor.cpp

@@ -149,7 +149,7 @@
 
     if (err = mResourceUsageProvider->GetInstanceMonitoringData(
             instanceID, mInstanceMonitoringData.Find(instanceID)->mSecond);
-        !err.IsNone()) {
+        !err.IsNone() && !err.Is(ErrorEnum::eNotFound)) {
         LOG_WRN() << "Can't get instance monitoring data: instanceID=" << instanceID << ", err=" << err;
     }
 
@@ -166,6 +166,22 @@
     return ErrorEnum::eNone;
 }
 
+Error ResourceMonitor::UpdateInstanceRunState(const String& instanceID, InstanceRunState runState)
+{
+    LockGuard lock {mMutex};
+
+    LOG_DBG() << "Update instance run state: instanceID=" << instanceID << ", runState=" << runState;
+
+    auto instanceData = mInstanceMonitoringData.Find(instanceID);
+    if (instanceData == mInstanceMonitoringData.end()) {
+        return ErrorEnum::eNotFound;
+    }
+
+    instanceData->mSecond.mRunState = runState;
+
+    return ErrorEnum::eNone;
+}
+
 Error ResourceMonitor::StopInstanceMonitoring(const String& instanceID)
 {
     LockGuard lock {mMutex};
@@ -465,7 +481,7 @@
         if (auto err = mResourceUsageProvider->GetNodeMonitoringData(
                 mNodeMonitoringData.mNodeID, mNodeMonitoringData.mMonitoringData);
             !err.IsNone()) {
-            LOG_ERR() << "Failed to get node monitoring data: " << err;
+            LOG_ERR() << "Failed to get node monitoring data: err=" << err;
         }
 
         mNodeMonitoringData.mMonitoringData.mCPU = CPUToDMIPs(mNodeMonitoringData.mMonitoringData.mCPU);
@@ -475,7 +491,11 @@
         for (auto& [instanceID, instanceMonitoringData] : mInstanceMonitoringData) {
             if (auto err = mResourceUsageProvider->GetInstanceMonitoringData(instanceID, instanceMonitoringData);
                 !err.IsNone()) {
-                LOG_ERR() << "Failed to get instance monitoring data: " << err;
+                if (instanceMonitoringData.mRunState == InstanceRunStateEnum::eActive) {
+                    LOG_ERR() << "Failed to get instance monitoring data: err=" << err;
+                }
+
+                continue;
             }
 
             instanceMonitoringData.mMonitoringData.mCPU = CPUToDMIPs(instanceMonitoringData.mMonitoringData.mCPU);

src/sm/launcher/instance.cpp

@@ -119,6 +119,10 @@
         return err;
     }
 
+    if (auto err = SetupMonitoring(); !err.IsNone()) {
+        return AOS_ERROR_WRAP(err);
+    }
+
     auto runStatus = mRunner.StartInstance(mInstanceID, mRuntimeDir, {});
 
     mRunState = runStatus.mState;
@@ -127,8 +131,8 @@
         return AOS_ERROR_WRAP(runStatus.mError);
     }
 
-    if (auto err = SetupMonitoring(); !err.IsNone()) {
-        return err;
+    if (auto err = mResourceMonitor.UpdateInstanceRunState(mInstanceID, mRunState); !err.IsNone()) {
+        return AOS_ERROR_WRAP(err);
     }
 
     return ErrorEnum::eNone;

tests/include/mocks/monitoringmock.hpp

@@ -20,6 +20,7 @@ class ResourceMonitorMock : public ResourceMonitorItf {
 public:
     MOCK_METHOD(Error, StartInstanceMonitoring,
         (const String& instanceID, const InstanceMonitorParams& monitoringConfig), (override));
+    MOCK_METHOD(Error, UpdateInstanceRunState, (const String& instanceID, InstanceRunState runState), (override));
     MOCK_METHOD(Error, StopInstanceMonitoring, (const String& instanceID), (override));
     MOCK_METHOD(Error, GetAverageMonitoringData, (NodeMonitoringData & monitoringData), (override));
 };