AdmissionPolicy (#51)

📝 Description

Rename ControllerAdmission to AdmissionPolicy
Resolve: #48

Author: mr-chelyshkin

src/controller/admission.rs

@@ -15,7 +15,7 @@
 
 /// Policy controlling how new submissions are handled when a slot is busy.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum ControllerAdmission {
+pub enum AdmissionPolicy {
     /// Skip task if already running.
     ///
     /// Use when:

src/controller/core.rs

@@ -13,7 +13,7 @@ use crate::{
 };
 
 use super::{
-    admission::ControllerAdmission,
+    admission::AdmissionPolicy,
     config::ControllerConfig,
     error::ControllerError,
     slot::{SlotState, SlotStatus},
@@ -154,7 +154,7 @@ impl Controller {
                         .with_reason(format!("admission={:?} status=running", admission)),
                 );
             }
-            (SlotStatus::Running { .. }, ControllerAdmission::Replace) => {
+            (SlotStatus::Running { .. }, AdmissionPolicy::Replace) => {
                 Self::replace_head_or_push(&mut slot, task_spec);
                 slot.status = SlotStatus::Terminating {
                     cancelled_at: Instant::now(),
@@ -177,7 +177,7 @@ impl Controller {
                         .with_reason(format!("admission=Replace depth={}", slot.queue.len())),
                 );
             }
-            (SlotStatus::Running { .. }, ControllerAdmission::Queue) => {
+            (SlotStatus::Running { .. }, AdmissionPolicy::Queue) => {
                 if self.reject_if_full(&slot_name, slot.queue.len()) {
                     return;
                 }
@@ -188,7 +188,7 @@ impl Controller {
                         .with_reason(format!("admission=Queue depth={}", slot.queue.len())),
                 );
             }
-            (SlotStatus::Terminating { .. }, ControllerAdmission::Replace) => {
+            (SlotStatus::Terminating { .. }, AdmissionPolicy::Replace) => {
                 Self::replace_head_or_push(&mut slot, task_spec);
                 self.bus.publish(
                     Event::new(EventKind::ControllerSubmitted)
@@ -199,7 +199,7 @@ impl Controller {
                         )),
                 );
             }
-            (SlotStatus::Terminating { .. }, ControllerAdmission::Queue) => {
+            (SlotStatus::Terminating { .. }, AdmissionPolicy::Queue) => {
                 if self.reject_if_full(&slot_name, slot.queue.len()) {
                     return;
                 }
@@ -213,7 +213,7 @@ impl Controller {
                         )),
                 );
             }
-            (SlotStatus::Running { .. }, ControllerAdmission::DropIfRunning) => {}
+            (SlotStatus::Running { .. }, AdmissionPolicy::DropIfRunning) => {}
             _ => {
                 if self.reject_if_full(&slot_name, slot.queue.len()) {
                     return;

src/controller/mod.rs

@@ -101,7 +101,7 @@
 //!
 //! - Configure via `Supervisor::builder(..).with_controller(ControllerConfig)`.
 //! - Submit via `sup.submit(ControllerSpec::{queue, replace, drop_if_running}(...))`.
-//! - Policies: [`ControllerAdmission`] = `Queue | Replace | DropIfRunning`.
+//! - Policies: [`AdmissionPolicy`] = `Queue | Replace | DropIfRunning`.
 //! - Controller emits `ControllerSubmitted`, `ControllerRejected`, and
 //!   `ControllerSlotTransition` (feature `"controller"`); readable with `"logging"`’s `LogWriter`.
 //!
@@ -117,7 +117,7 @@ mod error;
 mod slot;
 mod spec;
 
-pub use admission::ControllerAdmission;
+pub use admission::AdmissionPolicy;
 pub use config::ControllerConfig;
 pub use core::Controller;
 pub use error::ControllerError;

src/controller/spec.rs

@@ -1,4 +1,4 @@
-use super::admission::ControllerAdmission;
+use super::admission::AdmissionPolicy;
 use crate::TaskSpec;
 
 /// Request to submit a task to the controller.
@@ -7,7 +7,7 @@ use crate::TaskSpec;
 #[derive(Clone)]
 pub struct ControllerSpec {
     /// Admission policy.
-    pub admission: ControllerAdmission,
+    pub admission: AdmissionPolicy,
 
     /// Task specification to run.
     pub task_spec: TaskSpec,
@@ -19,7 +19,7 @@ impl ControllerSpec {
     /// ## Parameters
     /// - `admission`: How to handle concurrent submissions
     /// - `task_spec`: The task to execute
-    pub fn new(admission: ControllerAdmission, task_spec: TaskSpec) -> Self {
+    pub fn new(admission: AdmissionPolicy, task_spec: TaskSpec) -> Self {
         Self {
             admission,
             task_spec,
@@ -34,16 +34,16 @@ impl ControllerSpec {
     /// Convenience: Queue admission.
     #[inline]
     pub fn queue(task_spec: TaskSpec) -> Self {
-        Self::new(ControllerAdmission::Queue, task_spec)
+        Self::new(AdmissionPolicy::Queue, task_spec)
     }
 
     #[inline]
     pub fn replace(task_spec: TaskSpec) -> Self {
-        Self::new(ControllerAdmission::Replace, task_spec)
+        Self::new(AdmissionPolicy::Replace, task_spec)
     }
 
     #[inline]
     pub fn drop_if_running(task_spec: TaskSpec) -> Self {
-        Self::new(ControllerAdmission::DropIfRunning, task_spec)
+        Self::new(AdmissionPolicy::DropIfRunning, task_spec)
     }
 }

src/lib.rs

@@ -169,7 +169,7 @@ pub use tasks::{Task, TaskFn, TaskRef, TaskSpec};
 #[cfg(feature = "controller")]
 mod controller;
 #[cfg(feature = "controller")]
-pub use controller::{ControllerAdmission, ControllerConfig, ControllerError, ControllerSpec};
+pub use controller::{AdmissionPolicy, ControllerConfig, ControllerError, ControllerSpec};
 
 // Optional: expose a simple built-in logger subscriber (demo/reference).
 // Enable with: `--features logging`