revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 00:42:41 +01:00
Code Issues Releases Wiki Activity

Allow a DAO object storage namespace to be forced to a particular value

Browse source 
Summary:
Ref T6703. When we import external data from a third-party install to a Phacility instance, we must link instance accounts to central accounts: either existing central accounts, or newly created central accounts that we send invites for.

During this import, or when users register and claim those new accounts, we do a write from `admin.phacility.com` directly into the instance database to link the accounts.

This is pretty sketchy, and should almost certainly just be an internal API instead, particularly now that it's relatively stable.

However, it's what we use for now. The process has had some issues since the introduction of `%R` (combined database name and table refrence in queries), and now needs to be updated for the new `providerConfigPHID` column in `ExternalAccount`.

The problem is that `%R` isn't doing the right thing. We have code like this:

```
$conn = new_connection_to_instance('turtle');
queryf($conn, 'INSERT INTO %R ...', $table);
```

However, the `$table` resolves `%R` using the currently-executing-process information, not anything specific to `$conn`, so it prints `admin_user.user_externalaccount` (the name of the table on `admin.phacility.com`, where the code is running).

We want it to print `turtle_user.user_externalaccount` instead: the name of the table on `turtle.phacility.com`, where we're actually writing.

To force this to happen, let callers override the namespace part of the database name.

Long term: I'd plan to rip this out and replace it with an API call. This "connect directly to the database" stuff is nice for iterating on (only `admin` needs hotfixes) but very very sketchy for maintaining.

Test Plan: See next diff.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T6703

Differential Revision: https://secure.phabricator.com/D20167
This commit is contained in:
epriestley 2019-02-14 04:18:46 -08:00
parent be21dd3b52
commit 889eca1af9
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@
abstract class PhabricatorLiskDAO extends LiskDAO { abstract class PhabricatorLiskDAO extends LiskDAO {
private static $namespaceStack = array(); private static $namespaceStack = array();
private $forcedNamespace;
const ATTACHABLE = '<attachable>'; const ATTACHABLE = '<attachable>';
const CONFIG_APPLICATION_SERIALIZERS = 'phabricator/serializers'; const CONFIG_APPLICATION_SERIALIZERS = 'phabricator/serializers';
@ -47,6 +48,11 @@ abstract class PhabricatorLiskDAO extends LiskDAO {
return $namespace; return $namespace;
} }
public function setForcedStorageNamespace($namespace) {
$this->forcedNamespace = $namespace;
return $this;
}
/** /**
* @task config * @task config
*/ */
@ -188,7 +194,13 @@ abstract class PhabricatorLiskDAO extends LiskDAO {
abstract public function getApplicationName(); abstract public function getApplicationName();
protected function getDatabaseName() { protected function getDatabaseName() {
return self::getStorageNamespace().'_'.$this->getApplicationName(); if ($this->forcedNamespace) {
$namespace = $this->forcedNamespace;
} else {
$namespace = self::getStorageNamespace();
}
return $namespace.'_'.$this->getApplicationName();
} }
/** /**