MAGETWO-83571: Could not save bundle option in multithreading mode

Author: slopukhov

app/code/Magento/Bundle/Model/ResourceModel/Option.php

@@ -81,28 +81,21 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
         parent::_afterSave($object);
 
-        $condition = [
+        $conditions = [
             'option_id = ?' => $object->getId(),
             'store_id = ? OR store_id = 0' => $object->getStoreId(),
             'parent_product_id = ?' => $object->getParentId()
         ];
 
         $connection = $this->getConnection();
 
-        $select = $connection->select()->from($this->getTable('catalog_product_bundle_option_value'));
-        foreach ($condition as $k => $v) {
-            $select->where($k, $v);
-        }
-        $select->limit(1);
-
-        $rowSelect = $connection->fetchRow($select);
-        if (is_array($rowSelect)) {
+        if ($this->isOptionPresent($conditions)) {
             $connection->update(
                 $this->getTable('catalog_product_bundle_option_value'),
                 [
                     'title' => $object->getTitle()
                 ],
-                $condition
+                $conditions
             );
         } else {
             $data = new \Magento\Framework\DataObject();
@@ -225,4 +218,26 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
 
         return $this;
     }
+
+    /**
+     * Is Bundle option present in the database
+     *
+     * @param array $conditions
+     *
+     * @return bool
+     */
+    private function isOptionPresent($conditions)
+    {
+        $connection = $this->getConnection();
+
+        $select = $connection->select()->from($this->getTable('catalog_product_bundle_option_value'));
+        foreach ($conditions as $condition => $conditionValue) {
+            $select->where($condition, $conditionValue);
+        }
+        $select->limit(1);
+
+        $rowSelect = $connection->fetchRow($select);
+
+        return is_array($rowSelect);
+    }
 }