Changeset a5c293 for ThirdParty/JobMarket/src

Timestamp:

Apr 10, 2018, 6:42:56 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

AutomationFragmentation_failures, Candidate_v1.6.1, ChemicalSpaceEvaluator, Enhanced_StructuralOptimization_continued, Exclude_Hydrogens_annealWithBondGraph, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, JobMarket_RobustOnKillsSegFaults, PythonUI_with_named_parameters, StoppableMakroAction, TremoloParser_IncreasedPrecision

Children:

cdfb6f

Parents:

1e58bb

git-author:

Frederik Heber <frederik.heber@…> (04/07/18 21:52:17)

git-committer:

Frederik Heber <frederik.heber@…> (04/10/18 06:42:56)

Message:

FIX: SyncOperation now checks error codes from connect and close.

• FragmentController checks the derived SyncOperations' status in order to set the exit flag. Now, if we cannot connect to the server, then the controller will have a non-zero exit flag.
• Note that the exitflag was set already for all AsyncOperations.

Location:

ThirdParty/JobMarket/src/JobMarket

Files:

• Controller/FragmentController.cpp (modified) (6 diffs)
• Controller/FragmentController.hpp (modified) (1 diff)
• Operations/SyncOperation.cpp (modified) (3 diffs)

ThirdParty/JobMarket/src/JobMarket/Controller/FragmentController.cpp

@@ -173 +173 @@
     const std::string &service)
 {
-  GetNumberWorkersOperation *checkres = static_cast<GetNumberWorkersOperation *>(
+  GetNumberWorkersOperation *numberworkers = static_cast<GetNumberWorkersOperation *>(
       Commands.getByName("numberworkers"));
-  (*checkres)(host, service);
+  (*numberworkers)(host, service);
 }
 
@@ -197 +197 @@
 std::vector<size_t> FragmentController::getNumberOfWorkers()
 {
-  const GetNumberWorkersOperation * const checkres = static_cast<const GetNumberWorkersOperation *>(
+  const GetNumberWorkersOperation * const numberworkers = static_cast<const GetNumberWorkersOperation *>(
       Commands.getByName("numberworkers"));
-  return checkres->get();
+  return numberworkers->get();
 }
 
@@ -214 +214 @@
       Commands.getByName("removeallresults"));
   (*removeall)(host, service);
+  setExitflagFromStatus(*removeall);
 }
 
@@ -228 +229 @@
       Commands.getByName("removealljobs"));
   (*removeall)(host, service);
+  setExitflagFromStatus(*removeall);
 }
 
@@ -242 +244 @@
       Commands.getByName("removeallworker"));
   (*removeall)(host, service);
+  setExitflagFromStatus(*removeall);
 }
 
@@ -304 +307 @@
   job->setId(_newid);
 }
+
+/** helper function to set exit flag from SyncOperations' status.
+ *
+ * \param op operation whose status to check
+ */
+void FragmentController::setExitflagFromStatus(const Operation &op)
+{
+  if (op.getStatus() == Operation::success)
+    setExitflag(ExitflagContainer::OkFlag);
+  else
+    setExitflag(ExitflagContainer::ErrorFlag);
+}

ThirdParty/JobMarket/src/JobMarket/Controller/FragmentController.hpp

@@ -73 +73 @@
   boost::function<void ()> failed;
 
+  void setExitflagFromStatus(const Operation &op);
+
 private:
   //!> grant this specifically made proxy access to jobids

ThirdParty/JobMarket/src/JobMarket/Operations/SyncOperation.cpp

@@ -48 +48 @@
     // Start an asynchronous connect operation.
     LOG(3, "DEBUG: Connecting synchronously to endpoint " << endpoint << " ...");
-    connection_.socket().connect(endpoint);
+    boost::system::error_code ec;
+    connection_.socket().connect(endpoint, ec);
+    if (ec) {
+      ELOG(1, ec.message());
+      status = Operation::error;
+    }
   } else {
     status = Operation::error;
@@ -60 +65 @@
 void SyncOperation::disconnect()
 {
-  connection_.socket().close();
+  boost::system::error_code ec;
+  connection_.socket().close(ec);
+  if (ec) {
+    ELOG(1, ec.message());
+    status = Operation::error;
+  }
 }
 
@@ -78 +88 @@
 
   // call virtual function to continue
-  internal();
+  if (status == Operation::running)
+    internal();
 
   // disconnect
-  disconnect();
+  if (status == Operation::running)
+    disconnect();
 
   if (status == Operation::running)