Catch AfterCommitException from AbstractResource.php

If a callback in commit throws an excecption, the calling plugin needs to be able to distinguish this from a unsuccessful commit, so that it doesn't attempt a rollback on an already commited transaction. (Which would cause an  “Asymmetric transaction rollback" error)

Author: waynetheisinger

app/code/Magento/Authorization/Model/ResourceModel/Rules.php

@@ -121,6 +121,8 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
 
             $connection->commit();
             $this->aclDataCache->clean();
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $connection->rollBack();
             throw $e;

app/code/Magento/Catalog/Console/Command/ProductAttributesCleanUp.php

@@ -102,6 +102,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln("<info>Unused product attributes successfully cleaned up:</info>");
             $output->writeln("<comment>  " . implode("\n  ", $attributeTables) . "</comment>");
             return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $exception) {
             $this->attributeResource->rollBack();
 

app/code/Magento/Catalog/Model/Category.php

@@ -429,6 +429,8 @@ public function move($parentId, $afterCategoryId)
 
             // Set data for indexer
             $this->setAffectedCategoryIds([$this->getId(), $oldParentId, $parentId]);
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $e) {
             $this->_getResource()->rollBack();
             throw $e;

app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php

@@ -44,6 +44,8 @@ public function aroundSave(
             $result = $proceed($product, $saveOptions);
             $this->resourceModel->commit();
             return $result;
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $e) {
             $this->resourceModel->rollBack();
             throw $e;
@@ -69,6 +71,8 @@ public function aroundDelete(
             $result = $proceed($product);
             $this->resourceModel->commit();
             return $result;
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $e) {
             $this->resourceModel->rollBack();
             throw $e;
@@ -94,6 +98,8 @@ public function aroundDeleteById(
             $result = $proceed($productSku);
             $this->resourceModel->commit();
             return $result;
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $e) {
             $this->resourceModel->rollBack();
             throw $e;

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php

@@ -77,6 +77,8 @@ public function reindexAll()
             $this->_removeNotVisibleEntityFromIndex();
             $this->syncData();
             $this->commit();
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $e) {
             $this->rollBack();
             throw $e;

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php

@@ -167,6 +167,8 @@ public function reindexAll()
         try {
             $this->reindex();
             $this->commit();
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $e) {
             $this->rollBack();
             throw $e;

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php

@@ -119,6 +119,8 @@ public function reindexAll()
         try {
             $this->_prepareIndexTable();
             $this->commit();
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $e) {
             $this->rollBack();
             throw $e;

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Category.php

@@ -48,6 +48,8 @@ private function addCommitCallback(ResourceCategory $resourceCategory, \Closure
                 }
             });
             $resourceCategory->commit();
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $e) {
             $resourceCategory->rollBack();
             throw $e;

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product.php

@@ -53,6 +53,8 @@ private function addCommitCallback(ResourceProduct $productResource, \Closure $p
                 $this->reindexRow($product->getEntityId());
             });
             $productResource->commit();
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $e) {
             $productResource->rollBack();
             throw $e;

app/code/Magento/Customer/Model/Plugin/CustomerRepository/TransactionWrapper.php

@@ -44,6 +44,8 @@ public function aroundSave(
             $result = $proceed($customer, $passwordHash);
             $this->resourceModel->commit();
             return $result;
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $e) {
             $this->resourceModel->rollBack();
             throw $e;