Changeset ca09be

Timestamp:

Feb 10, 2015, 2:09:38 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

b569b8

Parents:

c17aa8

git-author:

Frederik Heber <heber@…> (01/25/15 15:51:25)

git-committer:

Frederik Heber <heber@…> (02/10/15 14:09:38)

Message:

FIX: FragmentationAutomationAction checks FragmentControllers' exitflags.

• this way we can tell when the connection to the server fails and we need to interrupt the Action and return failure.

Location:

src

Files:

• Actions/FragmentationAction/FragmentationAutomationAction.cpp (modified) (8 diffs)
• Fragmentation/Automation/ResultContainer_impl.hpp (modified) (1 diff)
• Fragmentation/Automation/SpecificFragmentController_ReceiveResultContainer_impl.hpp (modified) (2 diffs)

src/Actions/FragmentationAction/FragmentationAutomationAction.cpp

@@ -134 +134 @@
     // Phase One: obtain ids
     mpqccontroller.requestIds(NumberJobs);
+    if (mpqccontroller.getExitflag() != 0)
+      return Action::failure;
 
     // Phase Two: add MPQCJobs and send
@@ -159 +161 @@
     wait_thread.join();
     stop();
+    if (mpqccontroller.getExitflag() != 0)
+      return Action::failure;
+
     mpqccontroller.getResults(shortrangedata);
+    if (mpqccontroller.getExitflag() != 0)
+      return Action::failure;
 
     Exitflag += mpqccontroller.getExitflag();
@@ -189 +196 @@
     mpqccontroller.run();
     stop();
+    if (mpqccontroller.getExitflag() != 0)
+      return Action::failure;
 
     // get back the results and place them in shortrangedata
@@ -195 +204 @@
         "FragmentationFragmentationAutomationAction::performCall() - number of converted results "
         +toString(shortrangedata.size())+" and number of jobs "+toString(NumberJobs)+ " differ.");
+    if (mpqccontroller.getExitflag() != 0)
+      return Action::failure;
 
     Exitflag += mpqccontroller.getExitflag();
@@ -234 +245 @@
     const size_t NoJobs = shortrangedata.size()+full_sample.size();
     vmgcontroller.requestIds(2*NoJobs);
+    if (vmgcontroller.getExitflag() != 0)
+      return Action::failure;
 
     // Phase Five a: create VMGJobs for electronic charge distribution
@@ -254 +267 @@
     // Phase Six a: calculate result
     vmgcontroller.waitforResults(NoJobs);
+    if (vmgcontroller.getExitflag() != 0)
+      return Action::failure;
     vmgcontroller.getResults(longrangedata);
     ASSERT( NoJobs == longrangedata.size(),
@@ -282 +297 @@
       // Phase Six b: calculate result
       vmgcontroller.waitforResults(NoJobs);
+      if (vmgcontroller.getExitflag() != 0)
+        return Action::failure;
       vmgcontroller.getResults(longrangedata_both);
       ASSERT( NoJobs == longrangedata_both.size(),
@@ -287 +304 @@
           +toString(full_sample.size())+"="+toString(NoJobs)
           +" and second VMGresults "+toString(longrangedata_both.size())+" don't match.");
+      if (vmgcontroller.getExitflag() != 0)
+        return Action::failure;
       Exitflag += vmgcontroller.getExitflag();
 

src/Fragmentation/Automation/ResultContainer_impl.hpp

@@ -55 +55 @@
   for(;resultiter != fragmentresults.end(); ++resultiter, ++dataiter) {
     const JobId_t _id = (*resultiter)->getId();
+    if ((*resultiter)->exitflag == 0) {
 #ifndef NDEBUG
-    std::pair<typename std::map<JobId_t, T>::iterator, bool> inserter =
+      std::pair<typename std::map<JobId_t, T>::iterator, bool> inserter =
 #endif
-    IdData.insert( std::make_pair( _id, *dataiter) );
-    ASSERT( inserter.second,
-        "ResultContainer::insertResults() - result id "
-        +toString(inserter.first->first)+" already present.");
+      IdData.insert( std::make_pair( _id, *dataiter) );
+      ASSERT( inserter.second,
+          "ResultContainer::insertResults() - result id "
+          +toString(inserter.first->first)+" already present.");
+    }
   }
   ASSERT( dataiter == fragmentData.end(),

src/Fragmentation/Automation/SpecificFragmentController_ReceiveResultContainer_impl.hpp

@@ -52 +52 @@
   // wait but receive all results that are already done
   size_t NoReceivedResults = 0;
-  while (NoReceivedResults != NoExpectedResults) {
+  while ((NoReceivedResults != NoExpectedResults)
+      && (callback.getExitflag() == 0)) {
     // wait a bit
     boost::asio::deadline_timer timer(io_service);
@@ -60 +61 @@
     callback.checkResults(callback.host, callback.port);
     callback.RunService("Checking on results");
+    if (callback.getExitflag() != 0)
+      break;
 
     const std::pair<size_t, size_t> JobStatus = callback.getJobStatus();