Remove option to randomly select jobs

The random selection was taken from DJJob to prevent lock contention, but that is not applicable when jobs are executed by a scheduled cron job.
jkowens · Oct 11, 2018 · 6ea67ad · 6ea67ad
1 parent 8d34279
commit 6ea67ad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/app/code/community/Jowens/JobQueue/Model/Worker.php b/app/code/community/Jowens/JobQueue/Model/Worker.php
@@ -63,14 +63,8 @@ public function executeJobs($schedule=null) {
                 array('locked_by', 'eq' => $this->workerName)               
                 ))              
             ->addFieldToFilter('failed_at', array('null' => true))
-            ->addFieldToFilter('attempts', array('lt' => (int)Mage::getStoreConfig('jobqueue/config/max_attempts')));
-
-            if (Mage::getStoreConfigFlag('jobqueue/config/sort_random')) {
-                // randomly order to prevent lock contention among workers
-                $collection->getSelect()->order(new Zend_Db_Expr('RAND()'));
-            } else {
-                $collection->setOrder('id','ASC');
-            }
+            ->addFieldToFilter('attempts', array('lt' => (int)Mage::getStoreConfig('jobqueue/config/max_attempts')))
+            ->setOrder('id','ASC');
 
             $limit = Mage::getStoreConfig('jobqueue/config/limit_jobs');
             if ($limit > 0) {

diff --git a/app/code/community/Jowens/JobQueue/etc/config.xml b/app/code/community/Jowens/JobQueue/etc/config.xml
@@ -89,7 +89,6 @@
                 <cron_expr>*/5 * * * *</cron_expr>
                 <max_attempts>10</max_attempts>
                 <limit_jobs>1000</limit_jobs>
-                <sort_random>1</sort_random>
                 <queue>default</queue>
                 <log_level>0</log_level>
             </config>

diff --git a/app/code/community/Jowens/JobQueue/etc/system.xml b/app/code/community/Jowens/JobQueue/etc/system.xml
@@ -40,13 +40,6 @@
                             <show_in_default>1</show_in_default>
                             <comment>Set to 0 to have no limit</comment>
                         </limit_jobs>
-                        <sort_random>
-                            <label>Sort Jobs Randomly</label>
-                            <frontend_type>select</frontend_type>
-                            <source_model>adminhtml/system_config_source_yesno</source_model>
-                            <show_in_default>1</show_in_default>
-                            <sort_order>52</sort_order>
-                        </sort_random>
                         <queue>
                             <label>Queue</label>
                             <frontend_type>text</frontend_type>
@@ -66,4 +59,4 @@
             </groups>
         </jobqueue>
     </sections>
-</config>
+</config>