Qualify tenant-scoped bootstrap rotation and fresh Windows scripting
This commit is contained in:
@@ -1432,7 +1432,8 @@ impl Server {
|
||||
/// Blocking SDK call; run on the agent's bounded blocking worker, never heartbeat reactor.
|
||||
pub fn execution_timeout(action: &rmm_domain::jobs::Action, seconds: u32) -> Result<Duration> {
|
||||
ensure!(
|
||||
(1..=action.windows_system_runtime_limit(120, Some(rmm_domain::jobs::WINDOWS_UPDATE_MAX_SECONDS))).contains(&seconds),
|
||||
(1..=action.windows_system_runtime_limit(120, Some(rmm_domain::jobs::WINDOWS_UPDATE_MAX_SECONDS)))
|
||||
.contains(&seconds),
|
||||
"SYSTEM_EXECUTION_TIMEOUT_BOUND"
|
||||
);
|
||||
Ok(Duration::from_secs(u64::from(seconds) + 5))
|
||||
@@ -1455,9 +1456,12 @@ fn exchange_fixed(pin: &Pin, call: &Call, timeout: Duration, time_only: bool) ->
|
||||
anyhow::bail!("HELPER_CALL_TIMEOUT_BOUND");
|
||||
};
|
||||
let job = pin.binding.job(&request.job_bytes)?;
|
||||
ensure!(job.execution_identity == "system" && job.action.is_windows_update_template()
|
||||
&& execution_timeout(&job.action, job.max_runtime_seconds)? == timeout,
|
||||
"HELPER_CALL_TIMEOUT_BOUND");
|
||||
ensure!(
|
||||
job.execution_identity == "system"
|
||||
&& job.action.is_windows_update_template()
|
||||
&& execution_timeout(&job.action, job.max_runtime_seconds)? == timeout,
|
||||
"HELPER_CALL_TIMEOUT_BOUND"
|
||||
);
|
||||
} else {
|
||||
ensure!(timeout >= Duration::from_secs(1), "HELPER_CALL_TIMEOUT_BOUND");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user