Page MenuHomePhabricator
Files F15451972

D18679.id44847.diff
No OneTemporary
Actions

D18679.id44847.diff
View Options

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php
@@ -62,7 +62,24 @@
return 1;
}
- $databases = $api->getDatabaseList($patches, true);
+ $ref = $api->getRef();
+ $ref_key = $ref->getRefKey();
+
+ $schemata_map = id(new PhabricatorConfigSchemaQuery())
+ ->setAPIs(array($api))
+ ->setRefs(array($ref))
+ ->loadActualSchemata();
+ $schemata = $schemata_map[$ref_key];
+
+ $targets = array();
+ foreach ($schemata->getDatabases() as $database_name => $database) {
+ foreach ($database->getTables() as $table_name => $table) {
+ $targets[] = array(
+ 'database' => $database_name,
+ 'table' => $table_name,
+ );
+ }
+ }
list($host, $port) = $this->getBareHostAndPort($api->getHost());
@@ -126,35 +143,42 @@
$argv[] = $port;
}
- $argv[] = '--databases';
- foreach ($databases as $database) {
- $argv[] = $database;
- }
-
+ $commands = array();
+ foreach ($targets as $target) {
+ $target_argv = $argv;
+
+ if ($has_password) {
+ $commands[] = csprintf(
+ 'mysqldump -p%P %Ls -- %R %R',
+ $password,
+ $target_argv,
+ $target['database'],
+ $target['table']);
+ } else {
+ $command = csprintf(
+ 'mysqldump %Ls -- %R %R',
+ $target_argv,
+ $target['database'],
+ $target['table']);
+ }
- if ($has_password) {
- $command = csprintf('mysqldump -p%P %Ls', $password, $argv);
- } else {
- $command = csprintf('mysqldump %Ls', $argv);
+ $commands[] = $command;
}
+
// Decrease the CPU priority of this process so it doesn't contend with
// other more important things.
if (function_exists('proc_nice')) {
proc_nice(19);
}
-
- // If we aren't writing to a file, just passthru the command.
- if ($output_file === null) {
- return phutil_passthru('%C', $command);
- }
-
// If we are writing to a file, stream the command output to disk. This
// mode makes sure the whole command fails if there's an error (commonly,
// a full disk). See T6996 for discussion.
- if ($is_compress) {
+ if ($output_file === null) {
+ $file = null;
+ } else if ($is_compress) {
$file = gzopen($output_file, 'wb1');
} else {
$file = fopen($output_file, 'wb');
@@ -167,41 +191,47 @@
$file));
}
- $future = new ExecFuture('%C', $command);
-
try {
- $iterator = id(new FutureIterator(array($future)))
- ->setUpdateInterval(0.100);
- foreach ($iterator as $ready) {
- list($stdout, $stderr) = $future->read();
- $future->discardBuffers();
-
- if (strlen($stderr)) {
- fwrite(STDERR, $stderr);
- }
+ foreach ($commands as $command) {
+ $future = new ExecFuture('%C', $command);
+
+ $iterator = id(new FutureIterator(array($future)))
+ ->setUpdateInterval(0.100);
+ foreach ($iterator as $ready) {
+ list($stdout, $stderr) = $future->read();
+ $future->discardBuffers();
- if (strlen($stdout)) {
- if ($is_compress) {
- $ok = gzwrite($file, $stdout);
- } else {
- $ok = fwrite($file, $stdout);
+ if (strlen($stderr)) {
+ fwrite(STDERR, $stderr);
}
- if ($ok !== strlen($stdout)) {
- throw new Exception(
- pht(
- 'Failed to write %d byte(s) to file "%s".',
- new PhutilNumber(strlen($stdout)),
- $output_file));
+ if (strlen($stdout)) {
+ if (!$file) {
+ $ok = fwrite(STDOUT, $stdout);
+ } else if ($is_compress) {
+ $ok = gzwrite($file, $stdout);
+ } else {
+ $ok = fwrite($file, $stdout);
+ }
+
+ if ($ok !== strlen($stdout)) {
+ throw new Exception(
+ pht(
+ 'Failed to write %d byte(s) to file "%s".',
+ new PhutilNumber(strlen($stdout)),
+ $output_file));
+ }
}
- }
- if ($ready !== null) {
- $ready->resolvex();
+ if ($ready !== null) {
+ $ready->resolvex();
+ }
}
}
- if ($is_compress) {
+ if (!$file) {
+ $ok = true;
+ } else if ($is_compress) {
$ok = gzclose($file);
} else {
$ok = fclose($file);
@@ -218,7 +248,9 @@
// we don't leave any confusing artifacts laying around.
try {
- Filesystem::remove($output_file);
+ if ($file !== null) {
+ Filesystem::remove($output_file);
+ }
} catch (Exception $ex) {
// Ignore any errors we hit.
}

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 30, 12:55 AM (5 d, 16 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7590689
Default Alt Text
D18679.id44847.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility