unset($db_host, $db_user, $db_pass, $db_data);
};
- if(function_exists('sys_getloadavg')) {
+ $load = current_load();
+ if($load) {
$maxsysload = intval(get_config('system','maxloadavg'));
if($maxsysload < 1)
$maxsysload = 50;
- $load = sys_getloadavg();
- if(intval($load[0]) > $maxsysload) {
- logger('system: load ' . $load[0] . ' too high. poller deferred to next scheduled run.');
+ if(intval($load) > $maxsysload) {
+ logger('system: load ' . $load . ' too high. poller deferred to next scheduled run.');
return;
}
}
// Checking the number of workers
- if (poller_too_much_workers(1))
+ if (poller_too_much_workers(1)) {
+ poller_kill_stale_workers();
return;
+ }
if(($argc <= 1) OR ($argv[1] != "no_cron")) {
// Run the cron job that calls all other jobs
proc_run("php","include/cronhooks.php");
// Cleaning dead processes
- $r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
- foreach($r AS $pid)
- if (!posix_kill($pid["pid"], 0))
- q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
- intval($pid["pid"]));
- else {
- // To-Do: Kill long running processes
- // But: Update processes (like the database update) mustn't be killed
- }
-
+ poller_kill_stale_workers();
} else
// Sleep four seconds before checking for running processes again to avoid having too many workers
sleep(4);
while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
+ // Count active workers and compare them with a maximum value that depends on the load
+ if (poller_too_much_workers(3))
+ return;
+
q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
dbesc(datetime_convert()),
intval(getmypid()),
// Quit the poller once every hour
if (time() > ($starttime + 3600))
return;
-
- // Count active workers and compare them with a maximum value that depends on the load
- if (poller_too_much_workers(3))
- return;
}
}
+/**
+ * @brief fix the queue entry if the worker process died
+ *
+ */
+function poller_kill_stale_workers() {
+ $r = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+ foreach($r AS $pid)
+ if (!posix_kill($pid["pid"], 0))
+ q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
+ intval($pid["pid"]));
+ else {
+ // Kill long running processes
+ $duration = (time() - strtotime($pid["executed"])) / 60;
+ if ($duration > 180) {
+ logger("Worker process ".$pid["pid"]." took more than 3 hours. It will be killed now.");
+ posix_kill($pid["pid"], SIGTERM);
+
+ // Question: If a process is stale: Should we remove it or should we reschedule it?
+ // By now we rescheduling it. It's maybe not the wisest decision?
+ q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
+ intval($pid["pid"]));
+ } else
+ logger("Worker process ".$pid["pid"]." now runs for ".round($duration)." minutes. That's okay.", LOGGER_DEBUG);
+ }
+}
+
function poller_too_much_workers($stage) {
$queues = get_config("system", "worker_queues");
$active = poller_active_workers();
// Decrease the number of workers at higher load
- if(function_exists('sys_getloadavg')) {
- $load = max(sys_getloadavg());
-
+ $load = current_load();
+ if($load) {
$maxsysload = intval(get_config('system','maxloadavg'));
if($maxsysload < 1)
$maxsysload = 50;