Changeset e2f31d3

Timestamp:

Aug 11, 2025, 5:45:18 PM (3 months ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

aeec58

Parents:

2c3ae5

git-author:

Frederik Heber <frederik.heber@…> (07/13/25 21:53:12)

git-committer:

Frederik Heber <frederik.heber@…> (08/11/25 17:45:18)

Message:

JobMarket: PoolGuard checks also all other (idle) workers.

Location:

ThirdParty/JobMarket/src/JobMarket

Files:

• FragmentScheduler.cpp (modified) (1 diff)
• Pool/PoolGuard.cpp (modified) (3 diffs)
• Pool/PoolGuard.hpp (modified) (5 diffs)
• Pool/WorkerPool.hpp (modified) (2 diffs)

ThirdParty/JobMarket/src/JobMarket/FragmentScheduler.cpp

@@ -71 +71 @@
       boost::bind(&FragmentQueue::resubmitJob, boost::ref(JobsQueue), _1),
       boost::bind(&FragmentQueue::isResultPresent, boost::cref(JobsQueue), _1),
+      pool.getPoolOfWorkers(),
       OpQueue),
   shutdown_thread(NULL)

ThirdParty/JobMarket/src/JobMarket/Pool/PoolGuard.cpp

@@ -44 +44 @@
     const boost::function<void (const JobId_t)> _resubmitJobfunction,
     const boost::function<bool (const JobId_t)> _checkResultPresentfunction,
+    const Pool_t& _poolOfWorkers,
     OperationQueue &_OpQueue) :
   CheckAtNextInterval(_guardFromStart),
@@ -51 +52 @@
   resubmitJobfunction(_resubmitJobfunction),
   checkResultPresentfunction(_checkResultPresentfunction),
+  PoolOfWorkers(_poolOfWorkers),
   OpQueue(_OpQueue),
   connection(_connection),
@@ -103 +105 @@
       CheckWorker(*iter);
     }
-    LOG(1, "INFO: Checking on " << CurrentIdleWorkerList.size() << " idle workers.");
-    for(std::set<WorkerAddress>::const_iterator iter = CurrentIdleWorkerList.begin();
-        iter != CurrentIdleWorkerList.end(); ++iter) {
-      CheckWorker(*iter);
+    LOG(1, "INFO: Checking on " << PoolOfWorkers.size() << " all other workers.");
+    for(Pool_t::const_iterator iter = PoolOfWorkers.begin();
+        iter != PoolOfWorkers.end(); ++iter) {
+      if (currentworkers.find(*iter) == currentworkers.end()) {
+        CheckWorker(*iter);
+      }
     }
   } else {

ThirdParty/JobMarket/src/JobMarket/Pool/PoolGuard.hpp

@@ -37 +37 @@
 class PoolGuard {
 public:
+  //!> set of worker addresses
+  typedef std::set<WorkerAddress> Pool_t;
+
   /** Constructor for PoolGuard
    *
@@ -46 +49 @@
    * @param _resubmitJobfunction bound function to resubmit job by its JobId_t
    * @param _checkResultPresentfunction bound function to check whether a job's result by its JobId_t is present
+   * @param _poolOfWorkers pool of all workers for general check alives
    * @param _OpQueue access to operation queue for placing CheckAliveWorkerOperations
    */
@@ -56 +60 @@
       const boost::function<void (const JobId_t)> _resubmitJobfunction,
       const boost::function<bool (const JobId_t)> _checkResultPresentfunction,
+      const Pool_t& _poolOfWorkers,
       OperationQueue &_OpQueue
       );
@@ -101 +106 @@
    */
   void addBusyWorker(const WorkerAddress address, const JobId_t id);
+
+  /** Informs PoolGuard about a new idle worker.
+   *
+   * @param address address of worker
+   */
+  void addIdleWorker(const WorkerAddress address);
 
   /** Informs PoolGuard that a busy worker has finished.
@@ -154 +165 @@
 
   //!> set of idle working workers
-  std::set<WorkerAddress> CurrentIdleWorkerList;
+  const Pool_t& PoolOfWorkers;
 
   //!> reference to OperationQueue for pushing CheckAliveWorkerOperation

ThirdParty/JobMarket/src/JobMarket/Pool/WorkerPool.hpp

@@ -69 +69 @@
   typedef std::vector<std::pair<std::string, std::string> > WorkerList_t;
   WorkerList_t getListOfIdleWorkers() const;
+  //!> typedef for the pool of workers being a set to keep only unique addresses
+  typedef std::set<WorkerAddress> Pool_t;
+  const Pool_t& getPoolOfWorkers() const 
+  {
+    return pool;
+  }
 
   /** Return the number of busy workers.
@@ -121 +127 @@
 
 private:
-  //!> typedef for the pool of workers being a set to keep only unique addresses
-  typedef std::set<WorkerAddress> Pool_t;
-
-private:
   //!> FragmentScheduler needs access to removeAllWorkers()
   friend class FragmentScheduler;