Merge "Set ignore_user_abort( true ) during DB commit for sanity"

diff --combined includes/libs/rdbms/loadbalancer/LoadBalancer.php
index a60e741,7ad275a..37c028b
--- 1/includes/libs/rdbms/loadbalancer/LoadBalancer.php
--- 2/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@@ -1024,7 -1024,7 +1024,7 @@@ class LoadBalancer implements ILoadBala
        }
  
        public function finalizeMasterChanges() {
 -              $this->forEachOpenMasterConnection( function ( DatabaseBase $conn ) {
 +              $this->forEachOpenMasterConnection( function ( Database $conn ) {
                        // Any error should cause all DB transactions to be rolled back together
                        $conn->setTrxEndCallbackSuppression( false );
                        $conn->runOnTransactionPreCommitCallbacks();
@@@ -1077,7 -1077,7 +1077,7 @@@
  
                $failures = [];
                $this->forEachOpenMasterConnection(
 -                      function ( DatabaseBase $conn ) use ( $fname, &$failures ) {
 +                      function ( Database $conn ) use ( $fname, &$failures ) {
                                $conn->setTrxEndCallbackSuppression( true );
                                try {
                                        $conn->flushSnapshot( $fname );
@@@ -1101,6 -1101,9 +1101,9 @@@
        public function commitMasterChanges( $fname = __METHOD__ ) {
                $failures = [];
  
+               /** @noinspection PhpUnusedLocalVariableInspection */
+               $scope = $this->getScopedPHPBehaviorForCommit(); // try to ignore client aborts
+ 
                $restore = ( $this->trxRoundId !== false );
                $this->trxRoundId = false;
                $this->forEachOpenMasterConnection(
@@@ -1131,7 -1134,7 +1134,7 @@@
  
        public function runMasterPostTrxCallbacks( $type ) {
                $e = null; // first exception
 -              $this->forEachOpenMasterConnection( function ( DatabaseBase $conn ) use ( $type, &$e ) {
 +              $this->forEachOpenMasterConnection( function ( Database $conn ) use ( $type, &$e ) {
                        $conn->setTrxEndCallbackSuppression( false );
                        if ( $conn->writesOrCallbacksPending() ) {
                                // This happens if onTransactionIdle() callbacks leave callbacks on *another* DB
@@@ -1178,7 -1181,7 +1181,7 @@@
        }
  
        public function suppressTransactionEndCallbacks() {
 -              $this->forEachOpenMasterConnection( function ( DatabaseBase $conn ) {
 +              $this->forEachOpenMasterConnection( function ( Database $conn ) {
                        $conn->setTrxEndCallbackSuppression( true );
                } );
        }
@@@ -1516,6 -1519,23 +1519,23 @@@
                } );
        }
  
+       /**
+        * Make PHP ignore user aborts/disconnects until the returned
+        * value leaves scope. This returns null and does nothing in CLI mode.
+        *
+        * @return ScopedCallback|null
+        */
+       final protected function getScopedPHPBehaviorForCommit() {
+               if ( PHP_SAPI != 'cli' ) { // http://bugs.php.net/bug.php?id=47540
+                       $old = ignore_user_abort( true ); // avoid half-finished operations
+                       return new ScopedCallback( function () use ( $old ) {
+                               ignore_user_abort( $old );
+                       } );
+               }
+ 
+               return null;
+       }
+ 
        function __destruct() {
                // Avoid connection leaks for sanity
                $this->closeAll();