Merge "Add PreferencesFormPreSave hook"

[lhc/web/wiklou.git] / includes / db / LoadMonitor.php

diff --git a/includes/db/LoadMonitor.php b/includes/db/LoadMonitor.php
index 651c499..b6ba4f2 100644 (file)
--- a/includes/db/LoadMonitor.php
+++ b/includes/db/LoadMonitor.php
@@ -42,24 +42,6 @@ interface LoadMonitor {
         */
        function scaleLoads( &$loads, $group = false, $wiki = false );
 
-       /**
-        * Perform post-connection backoff.
-        *
-        * If the connection is in overload, this should return a backoff factor
-        * which will be used to control polling time. The number of threads
-        * connected is a good measure.
-        *
-        * If there is no overload, zero can be returned.
-        *
-        * A threshold thread count is given, the concrete class may compare this
-        * to the running thread count. The threshold may be false, which indicates
-        * that the sysadmin has not configured this feature.
-        *
-        * @param DatabaseBase $conn
-        * @param float $threshold
-        */
-       function postConnectionBackoff( $conn, $threshold );
-
        /**
         * Return an estimate of replication lag for each server
         *
@@ -78,9 +60,6 @@ class LoadMonitorNull implements LoadMonitor {
        function scaleLoads( &$loads, $group = false, $wiki = false ) {
        }
 
-       function postConnectionBackoff( $conn, $threshold ) {
-       }
-
        /**
         * @param array $serverIndexes
         * @param string $wiki
@@ -188,24 +167,4 @@ class LoadMonitorMySQL implements LoadMonitor {
 
                return $times;
        }
-
-       /**
-        * @param DatabaseBase|DatabaseMySQLBase $conn
-        * @param int $threshold
-        * @return int
-        */
-       function postConnectionBackoff( $conn, $threshold ) {
-               if ( !$threshold ) {
-                       return 0;
-               }
-               $status = $conn->getMysqlStatus( "Thread%" );
-               if ( $status['Threads_running'] > $threshold ) {
-                       $server = $conn->getProperty( 'mServer' );
-                       wfLogDBError( "LB backoff from $server - Threads_running = {$status['Threads_running']}\n" );
-
-                       return $status['Threads_connected'];
-               } else {
-                       return 0;
-               }
-       }
 }