Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202282
Change subject: Made replaceSectionContent try to use DB_SLAVE
......................................................................
Made replaceSectionContent try to use DB_SLAVE
Bug: T92357
Change-Id: I1626280c863a46d49215cc384e207458b2f8ec39
---
M includes/page/WikiPage.php
1 file changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/202282/1
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index b435c5c..eb8532f 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1513,8 +1513,18 @@
$baseRevId = null;
if ( $edittime && $sectionId !== 'new' ) {
- $dbw = wfGetDB( DB_MASTER );
- $rev = Revision::loadFromTimestamp( $dbw,
$this->mTitle, $edittime );
+ $dbr = wfGetDB( DB_SLAVE );
+ $rev = Revision::loadFromTimestamp( $dbr,
$this->mTitle, $edittime );
+ // Try the master if this thread may have just added it.
+ // This could be abstracted into a Revision method, but
we don't want
+ // to encourage loading of revisions by timestamp.
+ if ( !$rev
+ && wfGetLB()->getServerCount() > 1
+ && wfGetLB()->hasOrMadeRecentMasterChanges()
+ ) {
+ $dbw = wfGetDB( DB_MASTER );
+ $rev = Revision::loadFromTimestamp( $dbw,
$this->mTitle, $edittime );
+ }
if ( $rev ) {
$baseRevId = $rev->getId();
}
--
To view, visit https://gerrit.wikimedia.org/r/202282
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1626280c863a46d49215cc384e207458b2f8ec39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
