net/control/Protocol: add packet CANCEL_JOB

Author: MaxKellermann

debian/changelog

@@ -4,6 +4,7 @@ cm4all-workshop (7.2) unstable; urgency=low
   * workshop: implement TERMINATE_CHILDREN for "translate" and "spawn"
   * cron: support multiple CHILD_TAGs for TERMINATE_CHILDREN
   * control: allow enabling/disabling Workshop partitions by name
+  * control: add packet CANCEL_JOB
 
  --   
 

libcommon

@@ -10,6 +10,7 @@
 #include "cron/Partition.hxx"
 #include "spawn/Client.hxx"
 #include "util/SpanCast.hxx"
+#include "util/StringSplit.hxx"
 
 #include <fmt/core.h>
 
@@ -285,6 +286,16 @@ Instance::OnControlPacket(BengControl::Command command,
 		if (is_privileged)
 			ReloadState();
 		break;
+
+	case Command::CANCEL_JOB:
+		if (const auto [partition_name, job_id] = Split(ToStringView(payload), '\0');
+		    !job_id.empty()) {
+			for (auto &i : partitions)
+				if (partition_name == i.GetName())
+					i.CancelJob(job_id);
+		}
+
+		break;
 	}
 }
 

src/Instance.cxx

@@ -113,6 +113,10 @@ public:
 		return job.plan_name;
 	}
 
+	bool IsId(std::string_view id) const noexcept {
+		return job.id == id;
+	}
+
 	[[gnu::pure]]
 	bool IsChildTag(std::string_view value) const noexcept;
 

src/workshop/Operator.hxx

@@ -91,6 +91,10 @@ public:
 		queue.EnableAdmin();
 	}
 
+	void CancelJob(std::string_view id) noexcept {
+		workplace.CancelJob(id);
+	}
+
 	void TerminateChildren(std::string_view child_tag) noexcept {
 		workplace.CancelTag(child_tag);
 	}

src/workshop/Partition.hxx

@@ -113,6 +113,20 @@ WorkshopWorkplace::OnTimeout(WorkshopOperator *o) noexcept
 	OnExit(o);
 }
 
+void
+WorkshopWorkplace::CancelJob(std::string_view id) noexcept
+{
+	const auto n = operators.remove_and_dispose_if([id](const auto &o){
+		return o.IsId(id);
+	}, [](auto *o) {
+		o->Cancel();
+		delete o;
+	});
+
+	if (n > 0)
+		exit_listener.OnChildProcessExit(-1);
+}
+
 void
 WorkshopWorkplace::CancelTag(std::string_view tag) noexcept
 {

src/workshop/Workplace.cxx

@@ -99,5 +99,6 @@ public:
 	void OnExit(WorkshopOperator *o) noexcept;
 	void OnTimeout(WorkshopOperator *o) noexcept;
 
+	void CancelJob(std::string_view id) noexcept;
 	void CancelTag(std::string_view tag) noexcept;
 };