From 0845089a0fa790840c20a9f94708cb12a214f8d0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 16 Feb 2019 15:03:37 +0000
Subject: [PATCH 1/7] New scheduler mechanism

---
 src/Core/Worker.php | 86 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 84 insertions(+), 2 deletions(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 75d4e48740..a435d86b64 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -892,6 +892,85 @@ class Worker
 		return $passing_slow;
 	}
 
+	public static function nextProcess()
+	{
+		$priority = self::nextPriority();
+		if (empty($priority)) {
+			Logger::log('No tasks found', Logger::DEBUG);
+			return [];
+		}
+
+		if ($priority <= PRIORITY_MEDIUM) {
+			$limit = Config::get('system', 'worker_fetch_limit', 1);
+		} else {
+			$limit = 1;
+		}
+
+		$ids = [];
+		$stamp = (float)microtime(true);
+		$condition = ["`priority` = ? AND `pid` = 0 AND NOT `done` AND `next_try` < ?", $priority, DateTimeFormat::utcNow()];
+		$tasks = DBA::select('workerqueue', ['id'], $condition, ['limit' => $limit, 'order' => ['created']]);
+		self::$db_duration += (microtime(true) - $stamp);
+		while ($task = DBA::fetch($tasks)) {
+			$ids[] = $task['id'];
+		}
+		DBA::close($tasks);
+
+		Logger::log('Found task(s) ' . implode(', ', $ids) . ' with priority ' .$priority, Logger::DEBUG);
+		return $ids;
+	}
+
+	public static function nextPriority()
+	{
+		$waiting = [];
+		$priorities = [PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE];
+		foreach ($priorities as $priority) {
+			$stamp = (float)microtime(true);
+			if (DBA::exists('workerqueue', ["`priority` = ? AND `pid` = 0 AND NOT `done` AND `next_try` < ?", $priority, DateTimeFormat::utcNow()])) {
+				$waiting[$priority] = true;
+			}
+			self::$db_duration += (microtime(true) - $stamp);
+		}
+
+		if (!empty($waiting[PRIORITY_CRITICAL])) {
+			return PRIORITY_CRITICAL;
+		}
+
+		$running = [];
+		$stamp = (float)microtime(true);
+		$processes = DBA::p("SELECT COUNT(DISTINCT(`process`.`pid`)) AS `running`, `priority` FROM `process`
+			INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`
+			WHERE NOT `done` GROUP BY `priority`");
+		self::$db_duration += (microtime(true) - $stamp);
+		while ($process = DBA::fetch($processes)) {
+			$running[$process['priority']] = $process['running'];
+		}
+		DBA::close($processes);
+
+		$active = self::activeWorkers();
+
+		foreach ($priorities as $priority) {
+			if (!empty($waiting[$priority]) && empty($running[$priority])) {
+				return $priority;
+			}
+		}
+
+		// Temp
+		if (!empty($running[PRIORITY_LOW]) && ($running[PRIORITY_LOW] < 3)) {
+			return PRIORITY_LOW;
+		}
+
+		if (!empty($running[PRIORITY_NEGLIGIBLE]) && ($running[PRIORITY_NEGLIGIBLE] < 2)) {
+			return PRIORITY_NEGLIGIBLE;
+		}
+
+		if (!empty($waiting)) {
+			return array_shift(array_keys($waiting));
+		}
+
+		return false;
+	}
+
 	/**
 	 * @brief Find and claim the next worker process for us
 	 *
@@ -923,8 +1002,11 @@ class Worker
 		$limit = min($queue_length, ceil($slope * pow($entries, $exponent)));
 
 		Logger::log('Deferred: ' . $deferred . ' - Total: ' . $entries . ' - Maximum: ' . $queue_length . ' - jobs per queue: ' . $limit, Logger::DEBUG);
-		$ids = [];
-		if (self::passingSlow($highest_priority)) {
+
+		$ids = self::nextProcess();
+		$found = (count($ids) > 0);
+
+		if (!$found && self::passingSlow($highest_priority)) {
 			// Are there waiting processes with a higher priority than the currently highest?
 			$stamp = (float)microtime(true);
 			$result = DBA::select(

From 01d6ba85ffac949fbd88d1157030056ddf921e4a Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 17 Feb 2019 03:22:29 +0000
Subject: [PATCH 2/7] The number of workers per priority is now calculated
 dynamically

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

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index a435d86b64..b1e4aa41e1 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -834,64 +834,6 @@ class Worker
 		return $count;
 	}
 
-	/**
-	 * @brief Check if we should pass some slow processes
-	 *
-	 * When the active processes of the highest priority are using more than 2/3
-	 * of all processes, we let pass slower processes.
-	 *
-	 * @param string $highest_priority Returns the currently highest priority
-	 * @return bool We let pass a slower process than $highest_priority
-	 * @throws \Exception
-	 */
-	private static function passingSlow(&$highest_priority)
-	{
-		$highest_priority = 0;
-
-		$stamp = (float)microtime(true);
-		$r = DBA::p(
-			"SELECT `priority`
-				FROM `process`
-				INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done`"
-		);
-		self::$db_duration += (microtime(true) - $stamp);
-
-		// No active processes at all? Fine
-		if (!DBA::isResult($r)) {
-			return false;
-		}
-		$priorities = [];
-		while ($line = DBA::fetch($r)) {
-			$priorities[] = $line["priority"];
-		}
-		DBA::close($r);
-
-		// Should not happen
-		if (count($priorities) == 0) {
-			return false;
-		}
-		$highest_priority = min($priorities);
-
-		// The highest process is already the slowest one?
-		// Then we quit
-		if ($highest_priority == PRIORITY_NEGLIGIBLE) {
-			return false;
-		}
-		$high = 0;
-		foreach ($priorities as $priority) {
-			if ($priority == $highest_priority) {
-				++$high;
-			}
-		}
-		Logger::log("Highest priority: ".$highest_priority." Total processes: ".count($priorities)." Count high priority processes: ".$high, Logger::DEBUG);
-		$passing_slow = (($high/count($priorities)) > (2/3));
-
-		if ($passing_slow) {
-			Logger::log("Passing slower processes than priority ".$highest_priority, Logger::DEBUG);
-		}
-		return $passing_slow;
-	}
-
 	public static function nextProcess()
 	{
 		$priority = self::nextPriority();
@@ -937,6 +879,7 @@ class Worker
 		}
 
 		$running = [];
+		$running_total = 0;
 		$stamp = (float)microtime(true);
 		$processes = DBA::p("SELECT COUNT(DISTINCT(`process`.`pid`)) AS `running`, `priority` FROM `process`
 			INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`
@@ -944,28 +887,43 @@ class Worker
 		self::$db_duration += (microtime(true) - $stamp);
 		while ($process = DBA::fetch($processes)) {
 			$running[$process['priority']] = $process['running'];
+			$running_total += $process['running'];
 		}
 		DBA::close($processes);
 
-		$active = self::activeWorkers();
-
 		foreach ($priorities as $priority) {
 			if (!empty($waiting[$priority]) && empty($running[$priority])) {
+				Logger::log('No running worker found with priority ' . $priority . ' - assigning it.', Logger::DEBUG);
 				return $priority;
 			}
 		}
 
-		// Temp
-		if (!empty($running[PRIORITY_LOW]) && ($running[PRIORITY_LOW] < 3)) {
-			return PRIORITY_LOW;
+		$active = max(self::activeWorkers(), $running_total);
+		$priorities = max(count($waiting), count($running));
+		$exponent = 2;
+
+		$total = 0;
+		for ($i = 1; $i <= $priorities; ++$i) {
+			$total += pow($i, $exponent);
 		}
 
-		if (!empty($running[PRIORITY_NEGLIGIBLE]) && ($running[PRIORITY_NEGLIGIBLE] < 2)) {
-			return PRIORITY_NEGLIGIBLE;
+		$limit = [];
+		for ($i = 1; $i <= $priorities; ++$i) {
+			$limit[$priorities - $i] = max(1, round($active * (pow($i, $exponent) / $total)));
+		}
+
+		$i = 0;
+		foreach ($running as $priority => $workers) {
+			if ($workers < $limit[$i++]) {
+				Logger::log('Priority ' . $priority . ' has got ' . $workers . ' workers out of a limit of ' . $limit[$i - 1], Logger::DEBUG);
+				return $priority;
+			}
 		}
 
 		if (!empty($waiting)) {
-			return array_shift(array_keys($waiting));
+			$priority =  array_shift(array_keys($waiting));
+			Logger::log('No underassigned priority found, now taking the highest priority (' . $priority . ').', Logger::DEBUG);
+			return $priority;
 		}
 
 		return false;
@@ -984,89 +942,11 @@ class Worker
 	{
 		$mypid = getmypid();
 
-		// Check if we should pass some low priority process
-		$highest_priority = 0;
-		$found = false;
 		$passing_slow = false;
 
-		// The higher the number of parallel workers, the more we prefetch to prevent concurring access
-		// We decrease the limit with the number of entries left in the queue
-		$worker_queues = Config::get("system", "worker_queues", 4);
-		$queue_length = Config::get('system', 'worker_fetch_limit', 1);
-		$lower_job_limit = $worker_queues * $queue_length * 2;
-		$entries = max($entries - $deferred, 0);
-
-		// Now do some magic
-		$exponent = 2;
-		$slope = $queue_length / pow($lower_job_limit, $exponent);
-		$limit = min($queue_length, ceil($slope * pow($entries, $exponent)));
-
-		Logger::log('Deferred: ' . $deferred . ' - Total: ' . $entries . ' - Maximum: ' . $queue_length . ' - jobs per queue: ' . $limit, Logger::DEBUG);
-
 		$ids = self::nextProcess();
 		$found = (count($ids) > 0);
 
-		if (!$found && self::passingSlow($highest_priority)) {
-			// Are there waiting processes with a higher priority than the currently highest?
-			$stamp = (float)microtime(true);
-			$result = DBA::select(
-				'workerqueue',
-				['id'],
-				["`pid` = 0 AND `priority` < ? AND NOT `done` AND `next_try` < ?",
-				$highest_priority, DateTimeFormat::utcNow()],
-				['limit' => 1, 'order' => ['priority', 'created']]
-			);
-			self::$db_duration += (microtime(true) - $stamp);
-
-			while ($id = DBA::fetch($result)) {
-				$ids[] = $id["id"];
-			}
-			DBA::close($result);
-
-			$found = (count($ids) > 0);
-
-			if (!$found) {
-				// Give slower processes some processing time
-				$stamp = (float)microtime(true);
-				$result = DBA::select(
-					'workerqueue',
-					['id'],
-					["`pid` = 0 AND `priority` > ? AND NOT `done` AND `next_try` < ?",
-					$highest_priority, DateTimeFormat::utcNow()],
-					['limit' => 1, 'order' => ['priority', 'created']]
-				);
-				self::$db_duration += (microtime(true) - $stamp);
-
-				while ($id = DBA::fetch($result)) {
-					$ids[] = $id["id"];
-				}
-				DBA::close($result);
-
-				$found = (count($ids) > 0);
-				$passing_slow = $found;
-			}
-		}
-
-		// At first try to fetch a bunch of high or medium tasks
-		if (!$found && ($limit > 1)) {
-			$stamp = (float)microtime(true);
-			$result = DBA::select(
-				'workerqueue',
-				['id'],
-				["`pid` = 0 AND NOT `done` AND `priority` <= ? AND `next_try` < ? AND `retrial` = 0",
-				PRIORITY_MEDIUM, DateTimeFormat::utcNow()],
-				['limit' => $limit, 'order' => ['created']]
-			);
-			self::$db_duration += (microtime(true) - $stamp);
-
-			while ($id = DBA::fetch($result)) {
-				$ids[] = $id["id"];
-			}
-			DBA::close($result);
-
-			$found = (count($ids) > 0);
-		}
-
 		// If there is no result (or we shouldn't pass lower processes) we check without priority limit
 		if (!$found) {
 			$stamp = (float)microtime(true);

From 061d959e7f1387432c38d580429ed9e612954ed6 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 17 Feb 2019 18:55:17 +0000
Subject: [PATCH 3/7] Code cleanup

---
 mod/worker.php      |  6 +--
 src/Core/Worker.php | 95 ++++++++++++++++++---------------------------
 2 files changed, 38 insertions(+), 63 deletions(-)

diff --git a/mod/worker.php b/mod/worker.php
index 1afbfe81c1..23dfd6e000 100644
--- a/mod/worker.php
+++ b/mod/worker.php
@@ -41,11 +41,7 @@ function worker_init()
 
 	Worker::callWorker();
 
-	$passing_slow = false;
-	$entries = 0;
-	$deferred = 0;
-
-	if ($r = Worker::workerProcess($passing_slow, $entries, $deferred)) {
+	if ($r = Worker::workerProcess()) {
 		// On most configurations this parameter wouldn't have any effect.
 		// But since it doesn't destroy anything, we just try to get more execution time in any way.
 		set_time_limit(0);
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index b1e4aa41e1..efb90ae6b6 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -92,15 +92,8 @@ class Worker
 
 		$starttime = time();
 
-		$entries = 0;
-		$deferred = 0;
-
 		// We fetch the next queue entry that is about to be executed
-		while ($r = self::workerProcess($passing_slow, $entries, $deferred)) {
-			// When we are processing jobs with a lower priority, we don't refetch new jobs
-			// Otherwise fast jobs could wait behind slow ones and could be blocked.
-			$refetched = $passing_slow;
-
+		while ($r = self::workerProcess()) {
 			foreach ($r as $entry) {
 				// Assure that the priority is an integer value
 				$entry['priority'] = (int)$entry['priority'];
@@ -112,20 +105,16 @@ class Worker
 				}
 
 				// If possible we will fetch new jobs for this worker
-				if (!$refetched) {
-					$entries = self::totalEntries();
-					$deferred = self::deferredEntries();
-					if (Lock::acquire('worker_process', 0)) {
-						$refetched = self::findWorkerProcesses($passing_slow, $entries, $deferred);
-						Lock::release('worker_process');
-					}
+				if (!self::getWaitingJobForPID() && Lock::acquire('worker_process', 0)) {
+					self::findWorkerProcesses();
+					Lock::release('worker_process');
 				}
 			}
 
 			// 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($entries, $deferred)) {
+				if (self::tooMuchWorkers()) {
 					Logger::log('Active worker limit reached, quitting.', Logger::DEBUG);
 					Lock::release('worker');
 					return;
@@ -689,13 +678,10 @@ class Worker
 	/**
 	 * @brief Checks if the number of active workers exceeds the given limits
 	 *
-	 * @param integer $entries Total number of queue entries
-	 * @param integer $deferred Number of deferred queue entries
-	 *
 	 * @return bool Are there too much workers running?
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function tooMuchWorkers($entries = 0, $deferred = 0)
+	private static function tooMuchWorkers()
 	{
 		$queues = Config::get("system", "worker_queues", 4);
 
@@ -732,7 +718,7 @@ class Worker
 					$stamp = (float)microtime(true);
 					$jobs = DBA::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ? MINUTE", $interval);
 					self::$db_duration += (microtime(true) - $stamp);
-					self::$db_duration_stat += (microtime(true) - $stamp);
+					//self::$db_duration_stat += (microtime(true) - $stamp);
 					if ($job = DBA::fetch($jobs)) {
 						$jobs_per_minute[$interval] = number_format($job['jobs'] / $interval, 0);
 					}
@@ -746,12 +732,7 @@ class Worker
 
 			$idle_workers = $active;
 
-			if (empty($deferred) && empty($entries)) {
-				$deferred = self::deferredEntries();
-				$entries = max(self::totalEntries() - $deferred, 0);
-			}
-
-			$waiting_processes = max(0, $entries - $deferred);
+			$deferred = self::deferredEntries();
 
 			if (Config::get('system', 'worker_debug')) {
 				$waiting_processes = 0;
@@ -773,10 +754,14 @@ class Worker
 					DBA::close($processes);
 				}
 				DBA::close($jobs);
+				$entries = $deferred + $waiting_processes;
 			} else {
+				$entries = self::totalEntries();
+				$waiting_processes = max(0, $entries - $deferred);
 				$stamp = (float)microtime(true);
 				$jobs = DBA::p("SELECT COUNT(*) AS `running`, `priority` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` GROUP BY `priority` ORDER BY `priority`");
 				self::$db_duration += (microtime(true) - $stamp);
+				self::$db_duration_stat += (microtime(true) - $stamp);
 
 				while ($entry = DBA::fetch($jobs)) {
 					$idle_workers -= $entry["running"];
@@ -834,7 +819,20 @@ class Worker
 		return $count;
 	}
 
-	public static function nextProcess()
+	private static function getWaitingJobForPID()
+	{
+		$stamp = (float)microtime(true);
+		$r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
+		self::$db_duration += (microtime(true) - $stamp);
+		if (DBA::isResult($r)) {
+			return DBA::toArray($r);
+		}
+		DBA::close($r);
+
+		return false;
+	}
+
+	private static function nextProcess()
 	{
 		$priority = self::nextPriority();
 		if (empty($priority)) {
@@ -862,7 +860,7 @@ class Worker
 		return $ids;
 	}
 
-	public static function nextPriority()
+	private static function nextPriority()
 	{
 		$waiting = [];
 		$priorities = [PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE];
@@ -932,23 +930,17 @@ class Worker
 	/**
 	 * @brief Find and claim the next worker process for us
 	 *
-	 * @param boolean $passing_slow Returns if we had passed low priority processes
-	 * @param integer $entries Total number of queue entries
-	 * @param integer $deferred Number of deferred queue entries
 	 * @return boolean Have we found something?
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function findWorkerProcesses(&$passing_slow, $entries, $deferred)
+	private static function findWorkerProcesses()
 	{
 		$mypid = getmypid();
 
-		$passing_slow = false;
-
 		$ids = self::nextProcess();
-		$found = (count($ids) > 0);
 
-		// If there is no result (or we shouldn't pass lower processes) we check without priority limit
-		if (!$found) {
+		// If there is no result we check without priority limit
+		if (empty($ids)) {
 			$stamp = (float)microtime(true);
 			$result = DBA::select(
 				'workerqueue',
@@ -963,11 +955,9 @@ class Worker
 				$ids[] = $id["id"];
 			}
 			DBA::close($result);
-
-			$found = (count($ids) > 0);
 		}
 
-		if ($found) {
+		if (!empty($ids)) {
 			$stamp = (float)microtime(true);
 			$condition = "`id` IN (".substr(str_repeat("?, ", count($ids)), 0, -2).") AND `pid` = 0 AND NOT `done`";
 			array_unshift($ids, $condition);
@@ -976,33 +966,22 @@ class Worker
 			self::$db_duration_write += (microtime(true) - $stamp);
 		}
 
-		return $found;
+		return !empty($ids);
 	}
 
 	/**
 	 * @brief Returns the next worker process
 	 *
-	 * @param boolean $passing_slow Returns if we had passed low priority processes
-	 * @param integer $entries Returns total number of queue entries
-	 * @param integer $deferred Returns number of deferred queue entries
-	 *
 	 * @return string SQL statement
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function workerProcess(&$passing_slow, &$entries, &$deferred)
+	public static function workerProcess()
 	{
 		// There can already be jobs for us in the queue.
-		$stamp = (float)microtime(true);
-		$r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
-		self::$db_duration += (microtime(true) - $stamp);
-		if (DBA::isResult($r)) {
-			return DBA::toArray($r);
+		$waiting = self::getWaitingJobForPID();
+		if (!empty($waiting)) {
+			return $waiting;
 		}
-		DBA::close($r);
-
-		// Counting the rows outside the lock reduces the lock time
-		$entries = self::totalEntries();
-		$deferred = self::deferredEntries();
 
 		$stamp = (float)microtime(true);
 		if (!Lock::acquire('worker_process')) {
@@ -1010,7 +989,7 @@ class Worker
 		}
 		self::$lock_duration += (microtime(true) - $stamp);
 
-		$found = self::findWorkerProcesses($passing_slow, $entries, $deferred);
+		$found = self::findWorkerProcesses();
 
 		Lock::release('worker_process');
 

From a1a1367d6efbeaadf57e5120791b7200676641c2 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 17 Feb 2019 19:20:24 +0000
Subject: [PATCH 4/7] Added function description

---
 src/Core/Worker.php | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index efb90ae6b6..afc8b5ab3a 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -718,7 +718,7 @@ class Worker
 					$stamp = (float)microtime(true);
 					$jobs = DBA::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ? MINUTE", $interval);
 					self::$db_duration += (microtime(true) - $stamp);
-					//self::$db_duration_stat += (microtime(true) - $stamp);
+					self::$db_duration_stat += (microtime(true) - $stamp);
 					if ($job = DBA::fetch($jobs)) {
 						$jobs_per_minute[$interval] = number_format($job['jobs'] / $interval, 0);
 					}
@@ -819,6 +819,12 @@ class Worker
 		return $count;
 	}
 
+	/**
+	 * @brief Returns waiting jobs for the current process id
+	 *
+	 * @return array waiting workerqueue jobs
+	 * @throws \Exception
+	 */
 	private static function getWaitingJobForPID()
 	{
 		$stamp = (float)microtime(true);
@@ -832,6 +838,12 @@ class Worker
 		return false;
 	}
 
+	/**
+	 * @brief Returns the next jobs that should be executed
+	 *
+	 * @return array array with next jobs
+	 * @throws \Exception
+	 */
 	private static function nextProcess()
 	{
 		$priority = self::nextPriority();
@@ -860,6 +872,12 @@ class Worker
 		return $ids;
 	}
 
+	/**
+	 * @brief Returns the priority of the next workerqueue job
+	 *
+	 * @return string priority
+	 * @throws \Exception
+	 */
 	private static function nextPriority()
 	{
 		$waiting = [];
@@ -942,13 +960,8 @@ class Worker
 		// If there is no result we check without priority limit
 		if (empty($ids)) {
 			$stamp = (float)microtime(true);
-			$result = DBA::select(
-				'workerqueue',
-				['id'],
-				["`pid` = 0 AND NOT `done` AND `next_try` < ?",
-				DateTimeFormat::utcNow()],
-				['limit' => 1, 'order' => ['priority', 'created']]
-			);
+			$condition = ["`pid` = 0 AND NOT `done` AND `next_try` < ?", DateTimeFormat::utcNow()];
+			$result = DBA::select('workerqueue', ['id'], $condition, ['limit' => 1, 'order' => ['priority', 'created']]);
 			self::$db_duration += (microtime(true) - $stamp);
 
 			while ($id = DBA::fetch($result)) {
@@ -959,9 +972,8 @@ class Worker
 
 		if (!empty($ids)) {
 			$stamp = (float)microtime(true);
-			$condition = "`id` IN (".substr(str_repeat("?, ", count($ids)), 0, -2).") AND `pid` = 0 AND NOT `done`";
-			array_unshift($ids, $condition);
-			DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow(), 'pid' => $mypid], $ids);
+			$condition = ['id' => $ids, 'done' => false, 'pid' => 0];
+			DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow(), 'pid' => $mypid], $condition);
 			self::$db_duration += (microtime(true) - $stamp);
 			self::$db_duration_write += (microtime(true) - $stamp);
 		}

From 3183b3ce1264e11bca0683fdff7e3cf837ac645d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 17 Feb 2019 21:14:49 +0000
Subject: [PATCH 5/7] Improved indexes

---
 config/dbstructure.config.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/dbstructure.config.php b/config/dbstructure.config.php
index 6ce9d69474..050543675a 100644
--- a/config/dbstructure.config.php
+++ b/config/dbstructure.config.php
@@ -34,7 +34,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-	define('DB_UPDATE_VERSION', 1302);
+	define('DB_UPDATE_VERSION', 1303);
 }
 
 return [
@@ -1378,9 +1378,8 @@ return [
 			"PRIMARY" => ["id"],
 			"done_parameter" => ["done", "parameter(64)"],
 			"done_executed" => ["done", "executed"],
-			"done_priority" => ["done", "priority"],
 			"done_priority_created" => ["done", "priority", "created"],
-			"done_pid" => ["done", "pid"],
+			"done_priority_next_try" => ["done", "priority", "next_try"],
 			"done_pid_next_try" => ["done", "pid", "next_try"],
 			"done_pid_priority_created" => ["done", "pid", "priority", "created"]
 		]

From 3450f12cbab222b2db4a44074c96d3f078459f49 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 21 Feb 2019 19:32:31 +0000
Subject: [PATCH 6/7] Changed log calls

---
 src/Core/Worker.php   | 31 +++++++++++++++----------------
 src/Model/Contact.php |  2 +-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index afc8b5ab3a..ef746e878b 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -130,7 +130,7 @@ class Worker
 			}
 
 			// Quit the worker once every 5 minutes
-			if (time() > ($starttime + 300)) {
+			if (time() > ($starttime + 30)) {
 				Logger::log('Process lifetime reached, quitting.', Logger::DEBUG);
 				return;
 			}
@@ -411,16 +411,15 @@ class Worker
 		 * The execution time is the productive time.
 		 * By changing parameters like the maximum number of workers we can check the effectivness.
 		*/
-		Logger::log(
-			'DB: '.number_format(self::$db_duration - (self::$db_duration_count + self::$db_duration_write + self::$db_duration_stat), 4).
-			' - DB-Count: '.number_format(self::$db_duration_count, 4).
-			' - DB-Stat: '.number_format(self::$db_duration_stat, 4).
-			' - DB-Write: '.number_format(self::$db_duration_write, 4).
-			' - Lock: '.number_format(self::$lock_duration, 4).
-			' - Rest: '.number_format(max(0, $up_duration - (self::$db_duration + self::$lock_duration)), 4).
-			' - Execution: '.number_format($duration, 4),
-			Logger::DEBUG
-		);
+		$dbtotal = number_format(self::$db_duration - (self::$db_duration_count + self::$db_duration_write + self::$db_duration_stat), 4);
+		$dbcount = number_format(self::$db_duration_count, 4);
+		$dbstat  = number_format(self::$db_duration_stat, 4);
+		$dbwrite = number_format(self::$db_duration_write, 4);
+		$dblock  = number_format(self::$lock_duration, 4);
+		$rest    = number_format(max(0, $up_duration - (self::$db_duration + self::$lock_duration)), 4);
+		$exec    = number_format($duration, 4);
+
+		Logger::info('Performance:', ['total' => $dbtotal, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'block' => $dblock, 'rest' => $rest, 'exec' => $exec]);
 
 		self::$up_start = microtime(true);
 		self::$db_duration = 0;
@@ -848,7 +847,7 @@ class Worker
 	{
 		$priority = self::nextPriority();
 		if (empty($priority)) {
-			Logger::log('No tasks found', Logger::DEBUG);
+			Logger::info('No tasks found');
 			return [];
 		}
 
@@ -868,7 +867,7 @@ class Worker
 		}
 		DBA::close($tasks);
 
-		Logger::log('Found task(s) ' . implode(', ', $ids) . ' with priority ' .$priority, Logger::DEBUG);
+		Logger::info('Found:', ['id' => $ids, 'priority' => $priority]);
 		return $ids;
 	}
 
@@ -909,7 +908,7 @@ class Worker
 
 		foreach ($priorities as $priority) {
 			if (!empty($waiting[$priority]) && empty($running[$priority])) {
-				Logger::log('No running worker found with priority ' . $priority . ' - assigning it.', Logger::DEBUG);
+				Logger::info('No running worker found with priority {priority} - assigning it.', ['priority' => $priority]);
 				return $priority;
 			}
 		}
@@ -931,14 +930,14 @@ class Worker
 		$i = 0;
 		foreach ($running as $priority => $workers) {
 			if ($workers < $limit[$i++]) {
-				Logger::log('Priority ' . $priority . ' has got ' . $workers . ' workers out of a limit of ' . $limit[$i - 1], Logger::DEBUG);
+				Logger::info('Priority {priority} has got {workers} workers out of a limit of {limit}', ['priority' => $priority, 'workers' => $workers, 'limit' => $limit[$i - 1]]);
 				return $priority;
 			}
 		}
 
 		if (!empty($waiting)) {
 			$priority =  array_shift(array_keys($waiting));
-			Logger::log('No underassigned priority found, now taking the highest priority (' . $priority . ').', Logger::DEBUG);
+			Logger::info('No underassigned priority found, now taking the highest priority.', ['priority' => $priority]);
 			return $priority;
 		}
 
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 2d6bc716bb..d38d1cc101 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -616,7 +616,7 @@ class Contact extends BaseObject
 		DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM, 'deleted' => true], ['id' => $id]);
 
 		// Delete it in the background
-		Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
+		Worker::add(PRIORITY_MEDIUM, 'RemoveContact', $id);
 	}
 
 	/**

From 7810227040d7945d01b17ad0efb98840c24106c6 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 21 Feb 2019 19:34:12 +0000
Subject: [PATCH 7/7] Reverted test stuff

---
 src/Core/Worker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index ef746e878b..160277c744 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -130,7 +130,7 @@ class Worker
 			}
 
 			// Quit the worker once every 5 minutes
-			if (time() > ($starttime + 30)) {
+			if (time() > ($starttime + 300)) {
 				Logger::log('Process lifetime reached, quitting.', Logger::DEBUG);
 				return;
 			}