Load depending number of workers

This commit is contained in:
Michael Vogel 2015-09-27 13:56:20 +02:00
parent 173d1390df
commit ae21c40f21

View file

@ -56,14 +56,7 @@ function poller_run(&$argv, &$argc){
sleep(4); sleep(4);
// Checking number of workers // Checking number of workers
$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'"); if (poller_too_much_workers())
$queues = intval(get_config("system", "worker_queues"));
if ($queues == 0)
$queues = 4;
if ($workers[0]["workers"] >= $queues)
return; return;
$starttime = time(); $starttime = time();
@ -82,6 +75,9 @@ function poller_run(&$argv, &$argc){
if (time() > ($starttime + 3600)) if (time() > ($starttime + 3600))
return; return;
if (poller_too_much_workers())
return;
q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d", q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d",
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval(getmypid()), intval(getmypid()),
@ -117,6 +113,38 @@ function poller_run(&$argv, &$argc){
} }
function poller_too_much_workers() {
if(function_exists('sys_getloadavg')) {
$load = sys_getloadavg();
// To-Do
if ($load < 1)
$queues = 10;
elseif ($load < 5)
$queues = 4;
elseif ($load < 10)
$queues = 2;
else
$queues = 1;
} else {
$queues = intval(get_config("system", "worker_queues"));
if ($queues == 0)
$queues = 4;
}
if (poller_active_workers() >= $queues)
return;
}
function poller_active_workers() {
$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
return($workers[0]["workers"]);
}
if (array_search(__file__,get_included_files())===0){ if (array_search(__file__,get_included_files())===0){
poller_run($_SERVER["argv"],$_SERVER["argc"]); poller_run($_SERVER["argv"],$_SERVER["argc"]);
killme(); killme();