Cleanup ProfilerOutputDb try/catch logic for DBErrors

[lhc/web/wiklou.git] / includes / profiler / output / ProfilerOutputDb.php

diff --git a/includes/profiler/output/ProfilerOutputDb.php b/includes/profiler/output/ProfilerOutputDb.php
index 088721c..28dc2cc 100644 (file)
--- a/includes/profiler/output/ProfilerOutputDb.php
+++ b/includes/profiler/output/ProfilerOutputDb.php
@@ -21,6 +21,8 @@
  * @ingroup Profiler
  */
 
+use Wikimedia\Rdbms\DBError;
+
 /**
  * Logs profiling data into the local DB
  *
@@ -41,51 +43,64 @@ class ProfilerOutputDb extends ProfilerOutput {
        }
 
        public function canUse() {
-               # Do not log anything if database is readonly (bug 5375)
+               # Do not log anything if database is readonly (T7375)
                return !wfReadOnly();
        }
 
        public function log( array $stats ) {
-               $pfhost = $this->perHost ? wfHostname() : '';
-
                try {
                        $dbw = wfGetDB( DB_MASTER );
-                       $useTrx = ( $dbw->getType() === 'sqlite' ); // much faster
-                       if ( $useTrx ) {
-                               $dbw->startAtomic( __METHOD__ );
-                       }
-                       foreach ( $stats as $data ) {
-                               $name = $data['name'];
-                               $eventCount = $data['calls'];
-                               $timeSum = (float)$data['real'];
-                               $memorySum = (float)$data['memory'];
-                               $name = substr( $name, 0, 255 );
+               } catch ( DBError $e ) {
+                       return; // ignore
+               }
+
+               $fname = __METHOD__;
+               $dbw->onTransactionIdle( function () use ( $stats, $dbw, $fname ) {
+                       $pfhost = $this->perHost ? wfHostname() : '';
+                       // Sqlite: avoid excess b-tree rebuilds (mostly for non-WAL mode)
+                       // non-Sqlite: lower contention with small transactions
+                       $useTrx = ( $dbw->getType() === 'sqlite' );
 
-                               // Kludge
-                               $timeSum = $timeSum >= 0 ? $timeSum : 0;
-                               $memorySum = $memorySum >= 0 ? $memorySum : 0;
+                       try {
+                               $useTrx ? $dbw->startAtomic( $fname ) : null;
 
-                               $dbw->upsert( 'profiling',
-                                       [
-                                               'pf_name' => $name,
-                                               'pf_count' => $eventCount,
-                                               'pf_time' => $timeSum,
-                                               'pf_memory' => $memorySum,
-                                               'pf_server' => $pfhost
-                                       ],
-                                       [ [ 'pf_name', 'pf_server' ] ],
-                                       [
-                                               "pf_count=pf_count+{$eventCount}",
-                                               "pf_time=pf_time+{$timeSum}",
-                                               "pf_memory=pf_memory+{$memorySum}",
-                                       ],
-                                       __METHOD__
-                               );
+                               foreach ( $stats as $data ) {
+                                       $name = $data['name'];
+                                       $eventCount = $data['calls'];
+                                       $timeSum = (float)$data['real'];
+                                       $memorySum = (float)$data['memory'];
+                                       $name = substr( $name, 0, 255 );
+
+                                       // Kludge
+                                       $timeSum = $timeSum >= 0 ? $timeSum : 0;
+                                       $memorySum = $memorySum >= 0 ? $memorySum : 0;
+
+                                       $dbw->upsert( 'profiling',
+                                               [
+                                                       'pf_name' => $name,
+                                                       'pf_count' => $eventCount,
+                                                       'pf_time' => $timeSum,
+                                                       'pf_memory' => $memorySum,
+                                                       'pf_server' => $pfhost
+                                               ],
+                                               [ [ 'pf_name', 'pf_server' ] ],
+                                               [
+                                                       "pf_count=pf_count+{$eventCount}",
+                                                       "pf_time=pf_time+{$timeSum}",
+                                                       "pf_memory=pf_memory+{$memorySum}",
+                                               ],
+                                               $fname
+                                       );
+                               }
+                       } catch ( DBError $e ) {
+                               // ignore
                        }
-                       if ( $useTrx ) {
-                               $dbw->endAtomic( __METHOD__ );
+
+                       try {
+                               $useTrx ? $dbw->endAtomic( $fname ) : null;
+                       } catch ( DBError $e ) {
+                               // ignore
                        }
-               } catch ( DBError $e ) {
-               }
+               } );
        }
 }