From fdb856ae456a559fa74066704cd19858d317ed33 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 16 Oct 2012 20:36:49 -0700 Subject: Scheduler: tweak job_delay calc for bug #438650 * Max delay is reduced to 5 seconds (was 10). * Calculated delay is now proportional to current/desired load ratio. * When a delay is triggered, an event loop timeout is used to ensure that scheduling occurs as soon as the delay expires (rather than waiting for the _loadavg_latency timeout to expire). --- pym/_emerge/Scheduler.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 3b55b2bdb..99493ea6a 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -52,6 +52,7 @@ from _emerge.EbuildFetcher import EbuildFetcher from _emerge.EbuildPhase import EbuildPhase from _emerge.emergelog import emergelog from _emerge.FakeVartree import FakeVartree +from _emerge.getloadavg import getloadavg from _emerge._find_deep_system_runtime_deps import _find_deep_system_runtime_deps from _emerge._flush_elog_mod_echo import _flush_elog_mod_echo from _emerge.JobStatusDisplay import JobStatusDisplay @@ -247,9 +248,7 @@ class Scheduler(PollScheduler): # The load average takes some time to respond when new # jobs are added, so we need to limit the rate of adding # new jobs. - self._job_delay_max = 10 - self._job_delay_factor = 1.0 - self._job_delay_exp = 1.5 + self._job_delay_max = 5 self._previous_job_start_time = None # This is used to memoize the _choose_pkg() result when @@ -1584,15 +1583,27 @@ class Scheduler(PollScheduler): if self._jobs and self._max_load is not None: current_time = time.time() + try: + avg1, avg5, avg15 = getloadavg() + except OSError: + return False - delay = self._job_delay_factor * self._jobs ** self._job_delay_exp + delay = self._job_delay_max * avg1 / self._max_load if delay > self._job_delay_max: delay = self._job_delay_max - if (current_time - self._previous_job_start_time) < delay: + elapsed_seconds = current_time - self._previous_job_start_time + # elapsed_seconds < 0 means the system clock has been adjusted + if elapsed_seconds > 0 and elapsed_seconds < delay: + self._event_loop.timeout_add( + 1000 * (delay - elapsed_seconds), self._schedule_once) return True return False + def _schedule_once(self): + self._schedule() + return False + def _schedule_tasks_imp(self): """ @rtype: bool -- cgit v1.2.3-1-g7c22