Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/286201
Change subject: Avoid spamming the duplicate key fetch log in BagOStuff::merge()
......................................................................
Avoid spamming the duplicate key fetch log in BagOStuff::merge()
Change-Id: I68b10208f222f81f173f6e282c9ecf0bfcdde1fc
---
M includes/libs/objectcache/BagOStuff.php
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/01/286201/1
diff --git a/includes/libs/objectcache/BagOStuff.php
b/includes/libs/objectcache/BagOStuff.php
index 8e3c0a5..bf46ce1 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -285,8 +285,12 @@
protected function mergeViaCas( $key, $callback, $exptime = 0,
$attempts = 10 ) {
do {
$this->clearLastError();
+ $reportDupes = $this->reportDupes;
+ $this->reportDupes = false;
$casToken = null; // passed by reference
$currentValue = $this->getWithToken( $key, $casToken,
self::READ_LATEST );
+ $this->reportDupes = $reportDupes;
+
if ( $this->getLastError() ) {
return false; // don't spam retries (retry only
on races)
}
@@ -342,7 +346,11 @@
}
$this->clearLastError();
+ $reportDupes = $this->reportDupes;
+ $this->reportDupes = false;
$currentValue = $this->get( $key, self::READ_LATEST );
+ $this->reportDupes = $reportDupes;
+
if ( $this->getLastError() ) {
$success = false;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/286201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68b10208f222f81f173f6e282c9ecf0bfcdde1fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
