Skip to content

Commit 14f491b

Browse files
damcoupikulsky
andauthored
MAGE-937: Fixes for Queue (#1543)
* Update view.phtml (#1538) * The index in Algolia after full reindex has less records than expected (#1539) * Load last full reindex jobs after initial full reindex jobs without breaks * calculate last job id when it's required * Fixed case when no full reindex jobs * Reuse jobs count variable --------- Co-authored-by: pikulsky <[email protected]>
1 parent e775afd commit 14f491b

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Model/Queue.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,12 @@ protected function getJobs($maxJobs)
401401

402402
if ($jobsCount > 0 && $jobsCount < $maxJobs) {
403403
$restLimit = $maxJobs - $jobsCount;
404-
$lastFullReindexJobId = max($this->getJobsIdsFromMergedJobs($jobs));
404+
405+
if ($fullReindexJobsCount > 0) {
406+
$lastFullReindexJobId = max($this->getJobsIdsFromMergedJobs($fullReindexJobs));
407+
} else {
408+
$lastFullReindexJobId = max($this->getJobsIdsFromMergedJobs($jobs));
409+
}
405410

406411
$restFullReindexJobs = $this->fetchJobs($restLimit, true, $lastFullReindexJobId);
407412

view/adminhtml/templates/job/view.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ $job = $block->getCurrentJob();
8585
</div>
8686
</div>
8787
<div class="admin__field">
88-
<label class="admin__field-label"><span><<?php echo $block->escapeHtml(__('Data Size')); ?></span></label>
88+
<label class="admin__field-label"><span><?php echo $block->escapeHtml(__('Data Size')); ?></span></label>
8989
<div class="admin__field-control">
9090
<div class="admin__field admin__field-option">
9191
<?php echo $block->escapeHtml($job->getDataSize()); ?>

0 commit comments

Comments
 (0)