Page MenuHomePhabricator
Files F14385467

D16591.diff
No OneTemporary
Actions

D16591.diff
View Options

diff --git a/src/applications/config/check/PhabricatorMySQLSetupCheck.php b/src/applications/config/check/PhabricatorMySQLSetupCheck.php
--- a/src/applications/config/check/PhabricatorMySQLSetupCheck.php
+++ b/src/applications/config/check/PhabricatorMySQLSetupCheck.php
@@ -44,40 +44,6 @@
->addMySQLConfig('max_allowed_packet');
}
- $max_connections = self::loadRawConfigValue('max_connections');
-
- // A common default is 150, but we're fairly liberal about the number of
- // connections we open and it's easy for us to run far over this limit.
-
- $warning_threshold = 256;
- if ($max_connections < $warning_threshold) {
- $message = pht(
- 'MySQL is configured with a small "%s" (%d) limit, which may cause '.
- 'connection failures long before any resources near exhaustion. '.
- 'There is normally very little benefit to enforcing a connection '.
- 'limit, and most installs should increase it substantially.'.
- "\n\n".
- 'You can compute a specific connection limit for your install by '.
- 'doing a lot of math with MySQL buffer sizes and RAM available on '.
- 'the machine, or just set it to a huge number. In nearly every case, '.
- 'setting it to a huge number is entirely reasonable.'.
- "\n\n".
- 'You can raise this limit by adding this to your %s file (in the %s '.
- 'section) and then restarting %s:'.
- "\n\n%s",
- 'max_connections',
- $max_connections,
- phutil_tag('tt', array(), 'my.cnf'),
- phutil_tag('tt', array(), '[mysqld]'),
- phutil_tag('tt', array(), 'mysqld'),
- phutil_tag('pre', array(), 'max_connections=100000'));
-
- $this->newIssue('mysql.max_connections')
- ->setName(pht('Small MySQL "%s"', 'max_connections'))
- ->setMessage($message)
- ->addMySQLConfig('max_connections');
- }
-
$modes = self::loadRawConfigValue('sql_mode');
$modes = explode(',', $modes);
diff --git a/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php b/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php
--- a/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php
+++ b/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php
@@ -79,9 +79,15 @@
// - (T10849) Prevent any query from running for more than 30 seconds.
// - (T11672) Use persistent connections.
if (php_sapi_name() != 'cli') {
+
+ // TODO: For now, disable this until after T11044: it's better at high
+ // load, but causes us to use slightly more connections at low load and
+ // is pushing users over limits like MySQL "max_connections".
+ $use_persistent = false;
+
$connection
->setQueryTimeout(30)
- ->setPersistent(true);
+ ->setPersistent($use_persistent);
}
return $connection;

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 22, 11:46 AM (18 h, 43 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6918194
Default Alt Text
D16591.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility