revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-20 04:20:55 +01:00
Code Issues Releases Wiki Activity

Fix misleading error message when only cluster database masters are configured

Browse source 
Summary:
Fixes T11446. We can raise the misleading error:

> No valid databases are configured!

...when a valid master is configured but unreachable.

Instead, more carefully raise either "nothing is configured" or "nothing is reachable".

Test Plan: Configured only a master, artificially severed it, got "nothing is reachable" instead of "nothing is configured".

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T11446

Differential Revision: https://secure.phabricator.com/D16386
This commit is contained in:
epriestley 2016-08-10 11:54:27 -07:00
parent e8083ad63a
commit 3b45608c78
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/infrastructure/storage/lisk/PhabricatorLiskDAO.php
View file

@ -122,15 +122,16 @@ abstract class PhabricatorLiskDAO extends LiskDAO {
} }
$replica = PhabricatorDatabaseRef::getReplicaDatabaseRef(); $replica = PhabricatorDatabaseRef::getReplicaDatabaseRef();
if (!$replica) { if ($replica) {
throw new Exception( $connection = $replica->newApplicationConnection($database);
pht('No valid databases are configured!')); $connection->setReadOnly(true);
if ($replica->isReachable($connection)) {
return $connection;
}
} }
$connection = $replica->newApplicationConnection($database); if (!$master && !$replica) {
$connection->setReadOnly(true); $this->raiseUnconfigured($database);
if ($replica->isReachable($connection)) {
return $connection;
} }
$this->raiseUnreachable($database); $this->raiseUnreachable($database);
@ -153,10 +154,18 @@ abstract class PhabricatorLiskDAO extends LiskDAO {
$database)); $database));
} }
private function raiseUnconfigured($database) {
throw new Exception(
pht(
'Unable to establish a connection to any database host '.
'(while trying "%s"). No masters or replicas are configured.',
$database));
}
private function raiseUnreachable($database) { private function raiseUnreachable($database) {
throw new PhabricatorClusterStrandedException( throw new PhabricatorClusterStrandedException(
pht( pht(
'Unable to establish a connection to ANY database host '. 'Unable to establish a connection to any database host '.
'(while trying "%s"). All masters and replicas are completely '. '(while trying "%s"). All masters and replicas are completely '.
'unreachable.', 'unreachable.',
$database)); $database));