MAGETWO-75452: [Backport] - Fix Issue: “Asymmetric transaction rollback error” if commit callbacks throw exceptions magento#9955 - for 2.2

Author: omiroshnichenko

lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php

@@ -14,7 +14,18 @@
 abstract class AbstractResource
 {
     /**
-     * Main constructor
+     * @var Json
+     * @since 100.2.0
+     */
+    protected $serializer;
+
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    protected $_logger;
+
+    /**
+     * Constructor
      */
     public function __construct()
     {
@@ -82,7 +93,7 @@ public function commit()
                     call_user_func($callback);
                 }
             } catch (\Exception $e) {
-                throw $e;
+                $this->getLogger()->critical($e);
             }
         }
         return $this;
@@ -228,4 +239,34 @@ protected function _getColumnsForEntityLoad(\Magento\Framework\Model\AbstractMod
         }
         return $columns;
     }
+
+    /**
+     * Get serializer
+     *
+     * @return Json
+     * @deprecated 100.2.0
+     * @since 100.2.0
+     */
+    protected function getSerializer()
+    {
+        if (null === $this->serializer) {
+            $this->serializer = ObjectManager::getInstance()->get(Json::class);
+        }
+        return $this->serializer;
+    }
+
+    /**
+     * Get logger
+     *
+     * @return \Psr\Log\LoggerInterface
+     * @deprecated 100.2.0
+     * @since 100.2.0
+     */
+    private function getLogger()
+    {
+        if (null === $this->_logger) {
+            $this->_logger = ObjectManager::getInstance()->get(\Psr\Log\LoggerInterface::class);
+        }
+        return $this->_logger;
+    }
 }

lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php

@@ -10,6 +10,31 @@
 
 class AbstractResourceTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var AbstractResourceStub
+     */
+    private $abstractResource;
+
+    /**
+     * @var Json|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
+    /**
+     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $loggerMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->serializerMock = $this->createMock(Json::class);
+        $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $this->abstractResource = $objectManager->getObject(AbstractResourceStub::class);
+        $objectManager->setBackwardCompatibleProperty($this->abstractResource,'serializer',$this->serializerMock);
+        $objectManager->setBackwardCompatibleProperty($this->abstractResource,'_logger',$this->loggerMock);
+    }
+
     /**
      * @param array $arguments
      * @param string $expectation
@@ -144,9 +169,6 @@ function () use ($closureExpectation) {
         $abstractResource->commit();
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function testCommitZeroLevelCallbackException()
     {
         /** @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $connection */
@@ -165,6 +187,8 @@ function () {
         $connection->expects(static::once())
             ->method('getTransactionLevel')
             ->willReturn(0);
+        $this->loggerMock->expects($this->once())
+            ->method('critical');
 
         $abstractResource->commit();
     }