Merge pull request #2658 from annando/1607-maxload

Central Backend/Frontend detection when checking for overload
This commit is contained in:
Tobias Diekershoff 2016-07-02 21:52:48 +02:00 committed by GitHub
commit 598a9f76a6
4 changed files with 111 additions and 60 deletions

View File

@ -475,6 +475,7 @@ class App {
public $performance = array(); public $performance = array();
public $callstack = array(); public $callstack = array();
public $theme_info = array(); public $theme_info = array();
public $backend = true;
public $nav_sel; public $nav_sel;
@ -1111,6 +1112,80 @@ class App {
return($this->is_friendica_app); return($this->is_friendica_app);
} }
/**
* @brief Checks if the site is called via a backend process
*
* This isn't a perfect solution. But we need this check very early.
* So we cannot wait until the modules are loaded.
*
* @return bool Is it a known backend?
*/
function is_backend() {
$backend = array();
$backend[] = "_well_known";
$backend[] = "api";
$backend[] = "dfrn_notify";
$backend[] = "dfrn_poll";
$backend[] = "fetch";
$backend[] = "hcard";
$backend[] = "hostxrd";
$backend[] = "nodeinfo";
$backend[] = "noscrape";
$backend[] = "p";
$backend[] = "photo";
$backend[] = "photos";
$backend[] = "poco";
$backend[] = "post";
$backend[] = "proxy";
$backend[] = "pubsub";
$backend[] = "pubsubhubbub";
$backend[] = "receive";
$backend[] = "rsd_xml";
$backend[] = "salmon";
$backend[] = "statistics_json";
$backend[] = "xrd";
if (in_array($this->module, $backend))
return(true);
else
return($this->backend);
}
/**
* @brief Checks if the maximum number of database processes is reached
*
* @return bool Is the limit reached?
*/
function max_processes_reached() {
// Is the function called statically?
if (!is_object($this))
return(self::$a->max_processes_reached());
if ($this->is_backend()) {
$process = "backend";
$max_processes = get_config('system', 'max_processes_backend');
if (intval($max_processes) == 0)
$max_processes = 5;
} else {
$process = "frontend";
$max_processes = get_config('system', 'max_processes_frontend');
if (intval($max_processes) == 0)
$max_processes = 20;
}
$processlist = dbm::processlist();
if ($processlist["list"] != "") {
logger("Processcheck: Processes: ".$processlist["amount"]." - Processlist: ".$processlist["list"], LOGGER_DEBUG);
if ($processlist["amount"] > $max_processes) {
logger("Processcheck: Maximum number of processes for ".$process." tasks (".$max_processes.") reached.", LOGGER_DEBUG);
return true;
}
}
return false;
}
/** /**
* @brief Checks if the maximum load is reached * @brief Checks if the maximum load is reached
* *
@ -1118,14 +1193,26 @@ class App {
*/ */
function maxload_reached() { function maxload_reached() {
// Is the function called statically?
if (!is_object($this))
return(self::$a->maxload_reached());
if ($this->is_backend()) {
$process = "backend";
$maxsysload = intval(get_config('system', 'maxloadavg')); $maxsysload = intval(get_config('system', 'maxloadavg'));
if ($maxsysload < 1) if ($maxsysload < 1)
$maxsysload = 50; $maxsysload = 50;
} else {
$process = "frontend";
$maxsysload = intval(get_config('system','maxloadavg_frontend'));
if ($maxsysload < 1)
$maxsysload = 50;
}
$load = current_load(); $load = current_load();
if ($load) { if ($load) {
if (intval($load) > $maxsysload) { if (intval($load) > $maxsysload) {
logger('system: load '.$load.' too high.'); logger('system: load '.$load.' for '.$process.' tasks ('.$maxsysload.') too high.');
return true; return true;
} }
} }

View File

@ -1,4 +1,5 @@
<?php <?php
require_once("dbm.php");
# if PDO is avaible for mysql, use the new database abstraction # if PDO is avaible for mysql, use the new database abstraction
# TODO: PDO is disabled for release 3.3. We need to investigate why # TODO: PDO is disabled for release 3.3. We need to investigate why

View File

@ -11,7 +11,6 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
} }
require_once("boot.php"); require_once("boot.php");
require_once("dbm.php");
function poller_run(&$argv, &$argc){ function poller_run(&$argv, &$argc){
global $a, $db; global $a, $db;
@ -27,19 +26,8 @@ function poller_run(&$argv, &$argc){
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
}; };
$max_processes = get_config('system', 'max_processes_backend'); if ($a->max_processes_reached())
if (intval($max_processes) == 0)
$max_processes = 5;
$processlist = dbm::processlist();
if ($processlist["list"] != "") {
logger("Processcheck: Processes: ".$processlist["amount"]." - Processlist: ".$processlist["list"], LOGGER_DEBUG);
if ($processlist["amount"] > $max_processes) {
logger("Processcheck: Maximum number of processes for backend tasks (".$max_processes.") reached.", LOGGER_DEBUG);
return; return;
}
}
if (poller_max_connections_reached()) if (poller_max_connections_reached())
return; return;
@ -74,16 +62,9 @@ function poller_run(&$argv, &$argc){
while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) { while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
// Log the type of database processes // Constantly check the number of parallel database processes
$processlist = dbm::processlist(); if ($a->max_processes_reached())
if ($processlist["amount"] != "") {
logger("Processcheck: Processes: ".$processlist["amount"]." - Processlist: ".$processlist["list"], LOGGER_DEBUG);
if ($processlist["amount"] > $max_processes) {
logger("Processcheck: Maximum number of processes for backend tasks (".$max_processes.") reached.", LOGGER_DEBUG);
return; return;
}
}
// Constantly check the number of available database connections to let the frontend be accessible at any time // Constantly check the number of available database connections to let the frontend be accessible at any time
if (poller_max_connections_reached()) if (poller_max_connections_reached())

View File

@ -19,6 +19,10 @@ require_once('object/BaseObject.php');
$a = new App; $a = new App;
BaseObject::set_app($a); BaseObject::set_app($a);
// We assume that the index.php is called by a frontend process
// The value is set to "true" by default in boot.php
$a->backend = false;
/** /**
* *
* Load the configuration file which contains our DB credentials. * Load the configuration file which contains our DB credentials.
@ -41,7 +45,6 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
*/ */
require_once("include/dba.php"); require_once("include/dba.php");
require_once("include/dbm.php");
if(!$install) { if(!$install) {
$db = new dba($db_host, $db_user, $db_pass, $db_data, $install); $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
@ -54,35 +57,11 @@ if(!$install) {
load_config('config'); load_config('config');
load_config('system'); load_config('system');
$processlist = dbm::processlist(); if ($a->max_processes_reached() OR $a->maxload_reached()) {
if ($processlist["list"] != "") {
logger("Processcheck: Processes: ".$processlist["amount"]." - Processlist: ".$processlist["list"], LOGGER_DEBUG);
$max_processes = get_config('system', 'max_processes_frontend');
if (intval($max_processes) == 0)
$max_processes = 20;
if ($processlist["amount"] > $max_processes) {
logger("Processcheck: Maximum number of processes for frontend tasks (".$max_processes.") reached.", LOGGER_DEBUG);
system_unavailable();
}
}
$maxsysload_frontend = intval(get_config('system','maxloadavg_frontend'));
if($maxsysload_frontend < 1)
$maxsysload_frontend = 50;
$load = current_load();
if($load) {
if($load > $maxsysload_frontend) {
logger('system: load ' . $load . ' too high. Service Temporarily Unavailable.');
header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable'); header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable');
header('Retry-After: 300'); header('Retry-After: 300');
die("System is currently unavailable. Please try again later"); die("System is currently unavailable. Please try again later");
} }
}
if (get_config('system','force_ssl') AND ($a->get_scheme() == "http") AND if (get_config('system','force_ssl') AND ($a->get_scheme() == "http") AND
(intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND (intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
@ -114,9 +93,12 @@ load_translation_table($lang);
* *
*/ */
// Exclude the backend processes from the session management
if (!$a->is_backend()) {
$stamp1 = microtime(true); $stamp1 = microtime(true);
session_start(); session_start();
$a->save_timestamp($stamp1, "parser"); $a->save_timestamp($stamp1, "parser");
}
/** /**
* Language was set earlier, but we can over-ride it in the session. * Language was set earlier, but we can over-ride it in the session.