Changeset 3e334e

Timestamp:

Jun 21, 2018, 7:45:21 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.6.1, ChemicalSpaceEvaluator

Children:

8d56a6

Parents:

2ee2cc (diff), a6c11a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'AutomationFragmentation_failures' into Candidate_v1.6.1

File:

• src/Actions/FragmentationAction/FragmentationAutomationAction.cpp (modified) (3 diffs)

src/Actions/FragmentationAction/FragmentationAutomationAction.cpp

@@ -242 +242 @@
     // Phase One: obtain ids
     mpqccontroller.requestIds(NumberJobs);
-    if (mpqccontroller.getExitflag() != 0)
-      return Action::failure;
+    if (mpqccontroller.getExitflag() != 0) {
+      ELOG(1, "Could not request all ids from Server.");
+      return Action::failure;
+    }
 
     // Phase Two: add MPQCJobs and send
@@ -269 +271 @@
     wait_thread.join();
     stop();
-    if (mpqccontroller.getExitflag() != 0)
-      return Action::failure;
+    if (mpqccontroller.getExitflag() != 0) {
+      ELOG(1, "Could not obtain all results from Server.");
+      return Action::failure;
+    }
 
     mpqccontroller.getResults(shortrangedata);
@@ -439 +443 @@
       // Phase Six b: calculate result
       vmgcontroller.waitforResults(NoJobs);
-      if (vmgcontroller.getExitflag() != 0)
+      if (vmgcontroller.getExitflag() != 0) {
+        ELOG(1, "VMGFragmentController returned non-zero exit flag before getting results.");
         return Action::failure;
+      }
       vmgcontroller.getResults(longrangedata_both);
       ASSERT( NoJobs == longrangedata_both.size(),