From 935dfc307c3158a3e36af54c9e5a27483a0c02e6 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 24 Oct 2018 02:48:14 -0700 Subject: [PATCH] Silence transaction profiler master queries notices for rollback Change-Id: I53f0149cbf69ee2e57fe556668dd6cbfadd79823 --- includes/actions/RollbackAction.php | 5 +++++ includes/api/ApiRollback.php | 5 +++++ 2 files changed, 10 insertions(+) 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, -- 2.20.1