X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpoller.php;h=ce2a6be0fa62a1c9c1cccd2b8fd297f77bb9f39d;hb=24969d79d81646952d2a57485fa0ab6fe1ff36c5;hp=b54757b00bf1bb9f9b5aa7ffc9eb9fee3b4dd7e2;hpb=9559ecb5f304c4e86950d74ed7a9c01f999d61fc;p=friendica.git

diff --git a/include/poller.php b/include/poller.php
index b54757b00b..ce2a6be0fa 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -29,6 +29,10 @@ function poller_run(&$argv, &$argc){
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
+	$a->start_process();
+
+	$mypid = getmypid();
+
 	if ($a->max_processes_reached())
 		return;
 
@@ -46,10 +50,10 @@ function poller_run(&$argv, &$argc){
 
 	if(($argc <= 1) OR ($argv[1] != "no_cron")) {
 		// Run the cron job that calls all other jobs
-		proc_run("php","include/cron.php");
+		proc_run(PRIORITY_MEDIUM, "include/cron.php");
 
 		// Run the cronhooks job separately from cron for being able to use a different timing
-		proc_run("php","include/cronhooks.php");
+		proc_run(PRIORITY_MEDIUM, "include/cronhooks.php");
 
 		// Cleaning dead processes
 		poller_kill_stale_workers();
@@ -81,15 +85,19 @@ function poller_run(&$argv, &$argc){
 
 		q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
 			dbesc(datetime_convert()),
-			intval(getmypid()),
+			intval($mypid),
 			intval($r[0]["id"]));
 
 		// Assure that there are no tasks executed twice
-		$id = q("SELECT `id` FROM `workerqueue` WHERE `id` = %d AND `pid` = %d",
-			intval($r[0]["id"]),
-			intval(getmypid()));
+		$id = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
 		if (!$id) {
-			logger("Queue item ".$r[0]["id"]." was executed multiple times - skip this execution", LOGGER_DEBUG);
+			logger("Queue item ".$r[0]["id"]." vanished - skip this execution", LOGGER_DEBUG);
+			continue;
+		} elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) {
+			logger("Entry for queue item ".$r[0]["id"]." wasn't stored - we better stop here", LOGGER_DEBUG);
+			return;
+		} elseif ($id[0]["pid"] != $mypid) {
+			logger("Queue item ".$r[0]["id"]." is to be executed by process ".$id[0]["pid"]." and not by me (".$mypid.") - skip this execution", LOGGER_DEBUG);
 			continue;
 		}
 
@@ -111,15 +119,15 @@ function poller_run(&$argv, &$argc){
 		$funcname = str_replace(".php", "", basename($argv[0]))."_run";
 
 		if (function_exists($funcname)) {
-			logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
+			logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]);
 			$funcname($argv, $argc);
 
 			if ($cooldown > 0) {
-				logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
+				logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - in cooldown for ".$cooldown." seconds");
 				sleep($cooldown);
 			}
 
-			logger("Process ".getmypid()." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - done");
+			logger("Process ".$mypid." - Prio ".$r[0]["priority"]." - ID ".$r[0]["id"].": ".$funcname." - done");
 
 			q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
 		} else
@@ -217,7 +225,7 @@ function poller_max_connections_reached() {
  *
  */
 function poller_kill_stale_workers() {
-	$r = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+	$r = q("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
 
 	if (!dbm::is_result($r)) {
 		// No processing here needed
@@ -230,17 +238,34 @@ function poller_kill_stale_workers() {
 				intval($pid["pid"]));
 		else {
 			// Kill long running processes
+
+			// Check if the priority is in a valid range
+			if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE)))
+				$pid["priority"] = PRIORITY_MEDIUM;
+
+			// Define the maximum durations
+			$max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360);
+			$max_duration = $max_duration_defaults[$pid["priority"]];
+
+			$argv = json_decode($pid["parameter"]);
+			$argv[0] = basename($argv[0]);
+
+			// How long is the process already running?
 			$duration = (time() - strtotime($pid["executed"])) / 60;
-			if ($duration > 180) {
-				logger("Worker process ".$pid["pid"]." took more than 3 hours. It will be killed now.");
+			if ($duration > $max_duration) {
+				logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") took more than ".$max_duration." minutes. It will be killed now.");
 				posix_kill($pid["pid"], SIGTERM);
 
-				// Question: If a process is stale: Should we remove it or should we reschedule it?
-				// By now we rescheduling it. It's maybe not the wisest decision?
-				q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
+				// We killed the stale process.
+				// To avoid a blocking situation we reschedule the process at the beginning of the queue.
+				// Additionally we are lowering the priority.
+				q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `created` = '%s',
+							`priority` = %d, `pid` = 0 WHERE `pid` = %d",
+					dbesc(datetime_convert()),
+					intval(PRIORITY_NEGLIGIBLE),
 					intval($pid["pid"]));
 			} else
-				logger("Worker process ".$pid["pid"]." now runs for ".round($duration)." minutes. That's okay.", LOGGER_DEBUG);
+				logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
 		}
 }
 
@@ -273,6 +298,20 @@ function poller_too_much_workers() {
 		$s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00'");
 		$entries = $s[0]["total"];
 
+		if (Config::get("system", "worker_fastlane", false) AND ($queues > 0) AND ($entries > 0) AND ($active >= $queues)) {
+			$s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority` LIMIT 1");
+			$top_priority = $s[0]["priority"];
+
+			$s = q("SELECT `id` FROM `workerqueue` WHERE `priority` <= %d AND `executed` != '0000-00-00 00:00:00' LIMIT 1",
+				intval($top_priority));
+			$high_running = dbm::is_result($s);
+
+			if (!$high_running AND ($top_priority > PRIORITY_UNDEFINED) AND ($top_priority < PRIORITY_NEGLIGIBLE)) {
+				logger("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG);
+				$queues = $active + 1;
+			}
+		}
+
 		logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active."/".$entries." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
 
 		// Are there fewer workers running as possible? Then fork a new one.
@@ -288,13 +327,16 @@ function poller_too_much_workers() {
 }
 
 function poller_active_workers() {
-	$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+	$workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'poller.php'");
 
-	return($workers[0]["workers"]);
+	return($workers[0]["processes"]);
 }
 
 if (array_search(__file__,get_included_files())===0){
-  poller_run($_SERVER["argv"],$_SERVER["argc"]);
-  killme();
+	poller_run($_SERVER["argv"],$_SERVER["argc"]);
+
+	get_app()->end_process();
+
+	killme();
 }
 ?>