MC-42025: Bad performance and outages after upgrade to MariaDB 10.2.34

Author: dhorytskyi

app/code/Magento/Sales/Model/Grid/LastUpdateTimeCache.php

@@ -17,7 +17,7 @@ class LastUpdateTimeCache
     /**
      * Prefix for cache key.
      */
-    private const CACHE_PREFIX = 'LAST_GRID_UPDATE_TIME';
+    private const CACHE_PREFIX = 'LAST_GRID_UPDATE_TIME:';
 
     /**
      * @var CacheInterface

app/code/Magento/Sales/Model/ResourceModel/Grid.php

@@ -140,7 +140,10 @@ public function refreshBySchedule()
                 array_keys($this->columns)
             );
 
-            $lastUpdatedAt = max(array_column($fetchResult, 'updated_at'));
+            $timestamps = array_column($fetchResult, 'updated_at');
+            if ($timestamps) {
+                $lastUpdatedAt = max(max($timestamps), $lastUpdatedAt);
+            }
         }
 
         if ($lastUpdatedAt) {

app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedAtListProvider.php

@@ -49,25 +49,17 @@ public function __construct(
      */
     public function getIds($mainTableName, $gridTableName)
     {
-        $mainTableName = $this->resourceConnection->getTableName($mainTableName);
-        $gridTableName = $this->resourceConnection->getTableName($gridTableName);
         $select = $this->connection->select()
-            ->from($mainTableName, [$mainTableName . '.entity_id'])
+            ->from(['main_table' => $this->resourceConnection->getTableName($mainTableName)], ['main_table.entity_id'])
             ->joinInner(
-                [$gridTableName => $gridTableName],
-                sprintf(
-                    '%s.entity_id = %s.entity_id AND %s.updated_at > %s.updated_at',
-                    $mainTableName,
-                    $gridTableName,
-                    $mainTableName,
-                    $gridTableName
-                ),
+                ['grid_table' => $this->resourceConnection->getTableName($gridTableName)],
+                'main_table.entity_id = grid_table.entity_id AND main_table.updated_at > grid_table.updated_at',
                 []
             );
 
         $lastUpdatedAt = $this->lastUpdateTimeCache->get($gridTableName);
         if ($lastUpdatedAt) {
-            $select->where($mainTableName . '.updated_at > ?', $lastUpdatedAt);
+            $select->where('main_table.updated_at > ?', $lastUpdatedAt);
         }
 
         return $this->connection->fetchAll($select, [], \Zend_Db::FETCH_COLUMN);

app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridTest.php

@@ -36,6 +36,11 @@ class GridTest extends TestCase
      */
     private $connection;
 
+    /**
+     * @var LastUpdateTimeCache|MockObject
+     */
+    private $lastUpdateTimeCache;
+
     /**
      * @var string
      */
@@ -50,8 +55,9 @@ class GridTest extends TestCase
      * @var array
      */
     private $columns = [
-        'column_1_key' => 'column_1_value',
-        'column_2_key' => 'column_2_value'
+        'entity_id' => 'sales_order.entity_id',
+        'status' => 'sales_order.status',
+        'updated_at' => 'sales_order.updated_at',
     ];
 
     /**
@@ -62,7 +68,7 @@ protected function setUp(): void
         $objectManager = new ObjectManager($this);
         $this->notSyncedDataProvider = $this->createMock(NotSyncedDataProviderInterface::class);
         $this->connection = $this->createMock(ConnectionAdapterInterface::class);
-        $lastUpdateTimeCache = $this->createMock(LastUpdateTimeCache::class);
+        $this->lastUpdateTimeCache = $this->createMock(LastUpdateTimeCache::class);
 
         $this->grid = $objectManager->getObject(
             Grid::class,
@@ -73,7 +79,7 @@ protected function setUp(): void
                 'connection' => $this->connection,
                 '_tables' => ['sales_order' => $this->mainTable, 'sales_order_grid' => $this->gridTable],
                 'columns' => $this->columns,
-                'lastUpdateTimeCache' => $lastUpdateTimeCache,
+                'lastUpdateTimeCache' => $this->lastUpdateTimeCache,
             ]
         );
     }
@@ -84,10 +90,16 @@ protected function setUp(): void
     public function testRefreshBySchedule()
     {
         $notSyncedIds = ['1', '2', '3'];
-        $fetchResult = [
-            ['entity_id' => 1, 'updated_at' => date('Y-m-d H:i:s')],
-            ['entity_id' => 2, 'updated_at' => date('Y-m-d H:i:s')],
-        ];
+        $fetchResult = [];
+        for ($i = 1; $i <= 220; $i++) {
+            $fetchResult[] = [
+                'entity_id' => $i,
+                'status' => 1,
+                'updated_at' => '2021-01-01 01:02:03',
+            ];
+        }
+        $fetchResult[50]['updated_at'] = '2021-02-03 01:02:03';
+        $fetchResult[150]['updated_at'] = '2021-03-04 01:02:03';
 
         $this->notSyncedDataProvider->expects($this->atLeastOnce())
             ->method('getIds')
@@ -117,6 +129,10 @@ public function testRefreshBySchedule()
             ->with($this->gridTable, $fetchResult, array_keys($this->columns))
             ->willReturn(array_count_values($notSyncedIds));
 
+        $this->lastUpdateTimeCache->expects($this->once())
+            ->method('save')
+            ->with($this->gridTable, '2021-03-04 01:02:03');
+
         $this->grid->refreshBySchedule();
     }
 }