From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 24 Oct 2018 09:48:14 +0000 (-0700)
Subject: Silence transaction profiler master queries notices for rollback
X-Git-Tag: 1.34.0-rc.0~3650^2
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=935dfc307c3158a3e36af54c9e5a27483a0c02e6;p=lhc%2Fweb%2Fwiklou.git

Silence transaction profiler master queries notices for rollback

Change-Id: I53f0149cbf69ee2e57fe556668dd6cbfadd79823
---

diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php
index dc7b00ea41..7b4126278c 100644
--- a/includes/actions/RollbackAction.php
+++ b/includes/actions/RollbackAction.php
@@ -69,6 +69,11 @@ class RollbackAction extends FormlessAction {
 			] );
 		}
 
+		// @TODO: remove this hack once rollback uses POST (T88044)
+		$trxLimits = $this->context->getConfig()->get( 'TrxProfilerLimits' );
+		$trxProfiler = Profiler::instance()->getTransactionProfiler();
+		$trxProfiler->setExpectations( $trxLimits['POST'], __METHOD__ );
+
 		$data = null;
 		$errors = $this->page->doRollback(
 			$from,
diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php
index d2ff790296..e8a748bbb0 100644
--- a/includes/api/ApiRollback.php
+++ b/includes/api/ApiRollback.php
@@ -55,6 +55,11 @@ class ApiRollback extends ApiBase {
 			}
 		}
 
+		// @TODO: remove this hack once rollback uses POST (T88044)
+		$trxLimits = $this->getConfig()->get( 'TrxProfilerLimits' );
+		$trxProfiler = Profiler::instance()->getTransactionProfiler();
+		$trxProfiler->setExpectations( $trxLimits['POST'], __METHOD__ );
+
 		$retval = $pageObj->doRollback(
 			$this->getRbUser( $params ),
 			$summary,