D16386.id39409.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D16386.id39409.diff
View Options

	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
	@@ -122,15 +122,16 @@
	}

	$replica = PhabricatorDatabaseRef::getReplicaDatabaseRef();
	- if (!$replica) {
	- throw new Exception(
	- pht('No valid databases are configured!'));
	+ if ($replica) {
	+ $connection = $replica->newApplicationConnection($database);
	+ $connection->setReadOnly(true);
	+ if ($replica->isReachable($connection)) {
	+ return $connection;
	+ }
	}

	- $connection = $replica->newApplicationConnection($database);
	- $connection->setReadOnly(true);
	- if ($replica->isReachable($connection)) {
	- return $connection;
	+ if (!$master && !$replica) {
	+ $this->raiseUnconfigured($database);
	}

	$this->raiseUnreachable($database);
	@@ -153,10 +154,18 @@
	$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) {
	throw new PhabricatorClusterStrandedException(
	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 '.
	'unreachable.',
	$database));