Page MenuHomePhorge
Files F5305778

D26081.1749942087.diff
No OneTemporary
Actions

D26081.1749942087.diff
View Options

diff --git a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
--- a/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
+++ b/src/applications/config/check/PhabricatorDatabaseSetupCheck.php
@@ -173,7 +173,7 @@
}
// NOTE: It's possible that replication is broken but we have not been
- // granted permission to "SHOW SLAVE STATUS" so we can't figure it out.
+ // granted permission to "SHOW REPLICA STATUS" so we can't figure it out.
// We allow this kind of configuration and survive these checks, trusting
// that operations knows what they're doing. This issue is shown on the
// "Database Servers" console.
diff --git a/src/docs/user/cluster/cluster_databases.diviner b/src/docs/user/cluster/cluster_databases.diviner
--- a/src/docs/user/cluster/cluster_databases.diviner
+++ b/src/docs/user/cluster/cluster_databases.diviner
@@ -143,7 +143,7 @@
To report this status, the user Phorge is connecting as must have the
`REPLICATION CLIENT` privilege (or the `SUPER` privilege) so it can run the
-`SHOW SLAVE STATUS` command. The `REPLICATION CLIENT` privilege only enables
+`SHOW REPLICA STATUS` command. The `REPLICATION CLIENT` privilege only enables
the user to run diagnostic commands so it should be reasonable to grant it in
most cases, but it is not required. If you choose not to grant it, this page
can not show any useful diagnostic information about replication status but
diff --git a/src/infrastructure/cluster/PhabricatorDatabaseRef.php b/src/infrastructure/cluster/PhabricatorDatabaseRef.php
--- a/src/infrastructure/cluster/PhabricatorDatabaseRef.php
+++ b/src/infrastructure/cluster/PhabricatorDatabaseRef.php
@@ -346,13 +346,13 @@
$t_start = microtime(true);
$replica_status = false;
try {
- $replica_status = queryfx_one($conn, 'SHOW SLAVE STATUS');
+ $replica_status = queryfx_one($conn, 'SHOW REPLICA STATUS');
$ref->setConnectionStatus(self::STATUS_OKAY);
} catch (AphrontAccessDeniedQueryException $ex) {
$ref->setConnectionStatus(self::STATUS_REPLICATION_CLIENT);
$ref->setConnectionMessage(
pht(
- 'No permission to run "SHOW SLAVE STATUS". Grant this user '.
+ 'No permission to run "SHOW REPLICA STATUS". Grant this user '.
'"REPLICATION CLIENT" permission to allow this server to '.
'monitor replica health.'));
} catch (AphrontInvalidCredentialsQueryException $ex) {
@@ -386,7 +386,7 @@
$ref->setReplicaMessage(
pht(
'This host has a "replica" role, but is not replicating data '.
- 'from a master (no output from "SHOW SLAVE STATUS").'));
+ 'from a master (no output from "SHOW REPLICA STATUS").'));
} else {
$ref->setReplicaStatus(self::REPLICATION_OKAY);
}
diff --git a/src/infrastructure/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php b/src/infrastructure/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php
--- a/src/infrastructure/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php
+++ b/src/infrastructure/storage/connection/mysql/AphrontBaseMySQLDatabaseConnection.php
@@ -347,7 +347,7 @@
case 1044: // Access denied to database
case 1142: // Access denied to table
case 1143: // Access denied to column
- case 1227: // Access denied (e.g., no SUPER for SHOW SLAVE STATUS).
+ case 1227: // Access denied (e.g., no SUPER for SHOW REPLICA STATUS).
// See T13622. Try to help users figure out that this is a GRANT
// problem.

File Metadata

Mime Type
text/plain
Expires
Sat, Jun 14, 23:01 (1 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1854682
Default Alt Text
D26081.1749942087.diff (3 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0