MDEE-970: Do not mark items as deleted on single item failure (#468)

* MDEE-970: Do not mark items as deleted on single item failure

Author: mslabko

DataExporter/Export/Processor.php

@@ -16,6 +16,7 @@
 
 namespace Magento\DataExporter\Export;
 
+use Magento\DataExporter\Exception\UnableRetrieveData;
 use Magento\DataExporter\Export\Request\InfoAssembler;
 use Magento\DataExporter\Model\Indexer\FeedIndexMetadata;
 use Magento\DataExporter\Model\Logging\CommerceDataExportLoggerInterface as LoggerInterface;
@@ -101,12 +102,14 @@ public function processWithCallback(
             // if error happened during data collecting we skip entire process
             $this->logger->error(
                 \sprintf(
-                    'Unable to collect data for provider %s, error: %s',
+                    'Unable to collect data for provider %s, error: %s, skipped IDs: [%s]',
                     $provider,
-                    $exception->getMessage()
+                    $exception->getMessage(),
+                    \implode(', ', array_column($arguments, $metadata->getFeedIdentity()))
                 ),
                 ['exception' => $exception]
             );
+            throw new UnableRetrieveData();
         }
     }
 

DataExporter/Model/Indexer/FeedIndexProcessorCreateUpdate.php

@@ -138,15 +138,22 @@ public function partialReindex(
                     $feedItems = $this->addHashesAndModifiedAt($feedItems, $metadata);
                     $this->processFeedItems($feedItems, $metadata, $indexState, $serializer);
                 };
-                $this->exportProcessor->processWithCallback($metadata, $chunk, $dataProcessorCallback);
-
-                $this->handleDeletedItems(
-                    array_column($chunk, $feedIdentity),
-                    $indexState,
-                    $metadata,
-                    $serializer,
-                    $chunkTimeStamp
-                );
+                try {
+                    // "delete" handler must not be called if error happened during exporting phase
+                    $this->exportProcessor->processWithCallback($metadata, $chunk, $dataProcessorCallback);
+                    $this->handleDeletedItems(
+                        array_column($chunk, $feedIdentity),
+                        $indexState,
+                        $metadata,
+                        $serializer,
+                        $chunkTimeStamp
+                    );
+                } catch (\Throwable $e) {
+                    // for partial reindex thrown exception to return un-processed IDs back to changelog
+                    if ($isPartialReindex) {
+                        throw $e;
+                    }
+                }
             } else {
                 $this->feedUpdater->execute(
                     $this->exportProcessor->process($metadata->getFeedName(), $chunk),