scheduler: modify stf info scan procedure

Author: ironMann

src/TfScheduler/TfSchedulerStfInfo.cxx

@@ -157,9 +157,9 @@ void TfSchedulerStfInfo::SchedulingThread()
           const auto &lLastStfInfo = lStfInfoVec.back();
           const auto lTimeDiff = std::chrono::abs(lLastStfInfo.mUpdateLocalTime - lNow);
           if (lTimeDiff > sStfReapTime) {
-            LOG(WARNING) << "Reaping SubTimeFrames with ID: " << lStfId
-                         << ". Received STF infos: "
-                         << lStfInfoVec.size() << " / " << lNumStfSenders;
+            LOG(WARNING) << "Reaping SubTimeFrames. Received STF infos: "
+                         << lStfInfoVec.size() << " / " << lNumStfSenders
+                         <<" stf_id=" << lStfId;
 
             // find missing StfSenders
             std::set<std::string> lMissingStfSenders = lStfSenderIdSet;

src/TfScheduler/TfSchedulerTfBuilderInfo.cxx

@@ -124,16 +124,18 @@ void TfSchedulerTfBuilderInfo::HousekeepingThread()
 {
   using namespace std::chrono_literals;
   LOG(DEBUG) << "Starting TfBuilderInfo-Housekeeping thread...";
-  // wait for the device to go into RUNNING state
 
   std::vector<std::string> lIdsToErase;
 
   while (mRunning) {
-    const auto lNow = std::chrono::system_clock::now();
+
+    std::this_thread::sleep_for(1000ms);
 
     {
       std::scoped_lock lLock(mGlobalInfoLock);
 
+      const auto lNow = std::chrono::system_clock::now();
+
       // reap stale TfBuilders
       assert (lIdsToErase.empty());
       for (const auto &lIdInfo : mGlobalInfo) {
@@ -143,22 +145,20 @@ void TfSchedulerTfBuilderInfo::HousekeepingThread()
           lIdsToErase.emplace_back(lInfo->mTfBuilderUpdate.info().process_id());
         }
 
-        LOG(DEBUG) << "TfBuilder    : " << lInfo->mTfBuilderUpdate.info().process_id()
-                   << "\n  Free Memory      : " << lInfo->mTfBuilderUpdate.free_memory()
-                   << "\n  num_buffered_tfs : " << lInfo->mTfBuilderUpdate.num_buffered_tfs();
+        LOG(DEBUG) << "TfBuilder info id=" << lInfo->mTfBuilderUpdate.info().process_id()
+                   << " free_mem=" << lInfo->mTfBuilderUpdate.free_memory()
+                   << " num_buffered_tfs=" << lInfo->mTfBuilderUpdate.num_buffered_tfs();
       }
 
       if (!lIdsToErase.empty()) {
         for (const auto &lId : lIdsToErase) {
           mGlobalInfo.erase(lId);
           removeReadyTfBuilder(lId);
-          LOG (INFO) << "TfBuilder removed from scheduling (stale info), id: " << lId;
+          LOG (INFO) << "TfBuilder removed from scheduling (stale info), id=" << lId;
         }
         lIdsToErase.clear();
       }
-    } // mGlobalInfoLock unlock
-
-    std::this_thread::sleep_for(1000ms);
+    } // mGlobalInfoLock unlock (to be able to sleep)
   }
 
   LOG(DEBUG) << "Exiting TfBuilderInfo-Housekeeping thread...";

src/TfScheduler/TfSchedulerTfBuilderInfo.h

@@ -181,7 +181,7 @@ class TfSchedulerTfBuilderInfo
   static constexpr std::uint64_t sTfSizeOverestimatePercent = 20;
 
   /// Reap time for non-complete TFs
-  static constexpr auto sTfBuilderReapTime = 2s;
+  static constexpr auto sTfBuilderReapTime = 5s;
 
   /// Discovery configuration
   std::shared_ptr<ConsulTfSchedulerInstance> mDiscoveryConfig;