Changeset 9a3f84 for src/Fragmentation/Automation/FragmentQueue.cpp

Timestamp:

Jun 29, 2012, 1:23:14 PM (13 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:

aec098

Parents:

a8f54b6

git-author:

Frederik Heber <heber@…> (05/21/12 07:14:59)

git-committer:

Frederik Heber <heber@…> (06/29/12 13:23:14)

Message:

FragmentScheduler now uses WorkerChoices for handling connection workers.

• Workers always first send address, then their choice and depending on this we branch into various handlers.
• SubmitResultOperation and EnrollInPoolOperation now correctly give choice after sending address.
• handle_enrolled uses getNextIdleWorker() to mark indirectly as busy. This is temporary.
• we do not resubmit if Max_Attempts is 1.

File:

• src/Fragmentation/Automation/FragmentQueue.cpp (modified) (2 diffs)

src/Fragmentation/Automation/FragmentQueue.cpp

@@ -216 +216 @@
   AttemptsMap::iterator attemptiter = attempts.find(id);
   // check whether succeeded or (finally) failed
-  if ((_result->exitflag == 0) || ((attemptiter != attempts.end()) && (attemptiter->second >= Max_Attempts))) {
+  if ((_result->exitflag == 0) 
+       || ((attemptiter != attempts.end()) && (attemptiter->second >= Max_Attempts))
+       || (Max_Attempts == 1)) {
     // give notice if it is resubmitted job
     if (attemptiter != attempts.end()) {
@@ -258 +260 @@
       +" not stored in backup.");
   if (iter != backup.end()) {
-    // remove result
+    // remove present result
     ResultMap::iterator resiter = results.find(jobid);
     ASSERT( resiter != results.end(),
-        "FragmentQueue::resubmitJob() - resubmitting job "+toString(jobid)
-        +" for which no result is present.");
+        "FragmentQueue::resubmitJob() - job "+toString(jobid)
+        +" to resubmit has no result present.");
     results.erase(resiter);
     pushJob(iter->second);