From ea71a4e83af71239aad772db243ea982d1ea840e Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 8 Mar 2019 20:39:58 +0000
Subject: [PATCH] Refetch new jobs only once per execution loop

---
 src/Core/Worker.php | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 0a3f72db04..ac5c12fdd2 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -23,9 +23,9 @@ use Friendica\Util\Network;
 class Worker
 {
 	const STATE_STARTUP    = 1; // Worker is in startup. This takes most time.
-	const STATE_SHORT_LOOP = 2; // Worker is processing preassigned jobs, thus saving much time.
+	const STATE_LONG_LOOP  = 2; // Worker is processing the whole - long - loop.
 	const STATE_REFETCH    = 3; // Worker had refetched jobs in the execution loop.
-	const STATE_LONG_LOOP  = 4; // Worker is processing the whole - long - loop.
+	const STATE_SHORT_LOOP = 4; // Worker is processing preassigned jobs, thus saving much time.
 
 	private static $up_start;
 	private static $db_duration = 0;
@@ -102,6 +102,7 @@ class Worker
 
 		// We fetch the next queue entry that is about to be executed
 		while ($r = self::workerProcess()) {
+			$refetched = false;
 			foreach ($r as $entry) {
 				// Assure that the priority is an integer value
 				$entry['priority'] = (int)$entry['priority'];
@@ -112,34 +113,37 @@ class Worker
 					return;
 				}
 
-				// If possible we will fetch new jobs for this worker
-				if (!self::getWaitingJobForPID() && Lock::acquire('worker_process', 0)) {
+				// Trying to fetch new processes - but only once when successful
+				if (!$refetched && Lock::acquire('worker_process', 0)) {
 					self::findWorkerProcesses();
 					Lock::release('worker_process');
 					self::$state = self::STATE_REFETCH;
+					$refetched = true;
+				} else {
+					self::$state = self::STATE_SHORT_LOOP;
 				}
 			}
 
-			if (self::$state != self::STATE_REFETCH) {
-				self::$state = self::STATE_LONG_LOOP;
-			}
-
 			// To avoid the quitting of multiple workers only one worker at a time will execute the check
-			if (Lock::acquire('worker', 0)) {
-				// Count active workers and compare them with a maximum value that depends on the load
-				if (self::tooMuchWorkers()) {
-					Logger::log('Active worker limit reached, quitting.', Logger::DEBUG);
-					Lock::release('worker');
-					return;
-				}
+			if (!self::getWaitingJobForPID()) {
+				self::$state = self::STATE_LONG_LOOP;
 
-				// Check free memory
-				if ($a->isMinMemoryReached()) {
-					Logger::log('Memory limit reached, quitting.', Logger::DEBUG);
+				if (Lock::acquire('worker', 0)) {
+				// Count active workers and compare them with a maximum value that depends on the load
+					if (self::tooMuchWorkers()) {
+						Logger::log('Active worker limit reached, quitting.', Logger::DEBUG);
+						Lock::release('worker');
+						return;
+					}
+
+					// Check free memory
+					if ($a->isMinMemoryReached()) {
+						Logger::log('Memory limit reached, quitting.', Logger::DEBUG);
+						Lock::release('worker');
+						return;
+					}
 					Lock::release('worker');
-					return;
 				}
-				Lock::release('worker');
 			}
 
 			// Quit the worker once every cron interval
@@ -424,7 +428,6 @@ class Worker
 		self::$db_duration_stat = 0;
 		self::$db_duration_write = 0;
 		self::$lock_duration = 0;
-		self::$state = self::STATE_SHORT_LOOP;
 
 		if ($duration > 3600) {
 			$logger->info('Longer than 1 hour.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'duration' => round($duration/60, 3)]);