From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 13 Apr 2015 23:50:34 +0000 (-0700)
Subject: Reduce outages due to master DB problems in doViewUpdates
X-Git-Tag: 1.31.0-rc.0~11713^2
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=f96bc2eb6f272e0fb1e5261a8536ba8477227e03;p=lhc%2Fweb%2Fwiklou.git

Reduce outages due to master DB problems in doViewUpdates

Change-Id: Ie28e8dcfc3bc402b3119d9cf43612acab2af1004
---

diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 6242a548a8..37a01d4893 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1142,7 +1142,12 @@ class WikiPage implements Page, IDBAccessObject {
 		}
 
 		// Update newtalk / watchlist notification status
-		$user->clearNotification( $this->mTitle, $oldid );
+		try {
+			$user->clearNotification( $this->mTitle, $oldid );
+		} catch ( DBError $e ) {
+			// Avoid outage if the master is not reachable
+			MWExceptionHandler::logException( $e );
+		}
 	}
 
 	/**