From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 25 Jun 2014 19:34:28 +0000 (-0700)
Subject: Added some sanity warnings to TransactionProfiler
X-Git-Tag: 1.31.0-rc.0~15198^2
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=630284a62aa4313af7afc6eb28f633004193e466;p=lhc%2Fweb%2Fwiklou.git

Added some sanity warnings to TransactionProfiler

* The use of $id should avoid any nesting, unless something is broken

Change-Id: I01941a186d1e74ddd6c4610b0eb9e15f54e28347
---

diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index d5cdf28866..75f6966872 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -375,12 +375,12 @@ class TransactionProfiler {
 	public function transactionWritingIn( $server, $db, $id ) {
 		$name = "{$server} ({$db}) (TRX#$id)";
 		if ( isset( $this->mDBTrxHoldingLocks[$name] ) ) {
-			++$this->mDBTrxHoldingLocks[$name]['refs'];
-		} else {
-			$this->mDBTrxHoldingLocks[$name] = array(
-				'refs' => 1, 'start' => microtime( true ), 'conns' => array() );
-			$this->mDBTrxMethodTimes[$name] = array();
+			wfDebugLog( 'DBPerformance', "Nested transaction for '$name' - out of sync." );
 		}
+		$this->mDBTrxHoldingLocks[$name] =
+			array( 'start' => microtime( true ), 'conns' => array() );
+		$this->mDBTrxMethodTimes[$name] = array();
+
 		foreach ( $this->mDBTrxHoldingLocks as $name => &$info ) {
 			$info['conns'][$name] = 1; // track all DBs in transactions for this transaction
 		}
@@ -425,26 +425,28 @@ class TransactionProfiler {
 	 */
 	public function transactionWritingOut( $server, $db, $id ) {
 		$name = "{$server} ({$db}) (TRX#$id)";
-		if ( --$this->mDBTrxHoldingLocks[$name]['refs'] <= 0 ) {
-			$slow = false;
-			foreach ( $this->mDBTrxMethodTimes[$name] as $info ) {
-				$realtime = $info[1];
-				if ( $realtime >= $this->mDBLockThreshold ) {
-					$slow = true;
-					break;
-				}
+		if ( !isset( $this->mDBTrxMethodTimes[$name] ) ) {
+			wfDebugLog( 'DBPerformance', "Detected no transaction for '$name' - out of sync." );
+			return;
+		}
+		$slow = false;
+		foreach ( $this->mDBTrxMethodTimes[$name] as $info ) {
+			$realtime = $info[1];
+			if ( $realtime >= $this->mDBLockThreshold ) {
+				$slow = true;
+				break;
 			}
-			if ( $slow ) {
-				$dbs = implode( ', ', array_keys( $this->mDBTrxHoldingLocks[$name]['conns'] ) );
-				$msg = "Sub-optimal transaction on DB(s) [{$dbs}]:\n";
-				foreach ( $this->mDBTrxMethodTimes[$name] as $i => $info ) {
-					list( $method, $realtime ) = $info;
-					$msg .= sprintf( "%d\t%.6f\t%s\n", $i, $realtime, $method );
-				}
-				wfDebugLog( 'DBPerformance', $msg );
+		}
+		if ( $slow ) {
+			$dbs = implode( ', ', array_keys( $this->mDBTrxHoldingLocks[$name]['conns'] ) );
+			$msg = "Sub-optimal transaction on DB(s) [{$dbs}]:\n";
+			foreach ( $this->mDBTrxMethodTimes[$name] as $i => $info ) {
+				list( $method, $realtime ) = $info;
+				$msg .= sprintf( "%d\t%.6f\t%s\n", $i, $realtime, $method );
 			}
-			unset( $this->mDBTrxHoldingLocks[$name] );
-			unset( $this->mDBTrxMethodTimes[$name] );
+			wfDebugLog( 'DBPerformance', $msg );
 		}
+		unset( $this->mDBTrxHoldingLocks[$name] );
+		unset( $this->mDBTrxMethodTimes[$name] );
 	}
 }