dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "rdbms: update IDatabase::getLag comments"
[lhc/web/wiklou.git]
/
includes
/
libs
/
rdbms
/
database
/
DatabaseMysqlBase.php
diff --git
a/includes/libs/rdbms/database/DatabaseMysqlBase.php
b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index
315c9eb
..
b0fcade
100644
(file)
--- a/
includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/
includes/libs/rdbms/database/DatabaseMysqlBase.php
@@
-903,6
+903,13
@@
abstract class DatabaseMysqlBase extends Database {
$rpos = $this->getReplicaPos();
$gtidsWait = $rpos ? MySQLMasterPos::getCommonDomainGTIDs( $pos, $rpos ) : [];
if ( !$gtidsWait ) {
$rpos = $this->getReplicaPos();
$gtidsWait = $rpos ? MySQLMasterPos::getCommonDomainGTIDs( $pos, $rpos ) : [];
if ( !$gtidsWait ) {
+ $this->queryLogger->error(
+ "No GTIDs with the same domain between master ($pos) and replica ($rpos)",
+ $this->getLogContext( [
+ 'method' => __METHOD__,
+ ] )
+ );
+
return -1; // $pos is from the wrong cluster?
}
// Wait on the GTID set (MariaDB only)
return -1; // $pos is from the wrong cluster?
}
// Wait on the GTID set (MariaDB only)