timeouts: Use Duration type for re queue time more

Summary: Types are good

Reviewed By: IanChilds

Differential Revision: D78309455

fbshipit-source-id: 3fd938966b1612bce8f5823d108e286b8a53e790

Author: JakobDegen

app/buck2_build_api/src/interpreter/rule_defs/command_executor_config.rs

@@ -9,6 +9,7 @@
  */
 
 use std::sync::Arc;
+use std::time::Duration;
 
 use allocative::Allocative;
 use buck2_core::execution_types::executor_config::CacheUploadBehavior;
@@ -111,7 +112,7 @@ pub fn register_command_executor_config(builder: &mut GlobalsBuilder) {
         #[starlark(default = NoneOr::None, require = named)]
         remote_execution_max_input_files_mebibytes: NoneOr<i32>,
         #[starlark(default = NoneOr::None, require = named)]
-        remote_execution_queue_time_threshold_s: NoneOr<i32>,
+        remote_execution_queue_time_threshold_s: NoneOr<u64>,
         #[starlark(default = NoneType, require = named)] remote_execution_use_case: Value<'v>,
         #[starlark(default = false, require = named)] use_limited_hybrid: bool,
         #[starlark(default = false, require = named)] allow_limited_hybrid_fallbacks: bool,
@@ -211,15 +212,12 @@ pub fn register_command_executor_config(builder: &mut GlobalsBuilder) {
                     .buck_error_context("remote_execution_max_input_files_mebibytes is negative")?
                     .map(|b| b * 1024 * 1024);
 
-                let re_max_queue_time_ms = remote_execution_queue_time_threshold_s
-                    .map(u64::try_from)
-                    .transpose()
-                    .buck_error_context("remote_execution_queue_time_threshold_s is negative")?
-                    .map(|t| t * 1000);
+                let re_max_queue_time =
+                    remote_execution_queue_time_threshold_s.map(Duration::from_secs);
 
                 Some(RemoteExecutorOptions {
                     re_max_input_files_bytes,
-                    re_max_queue_time_ms,
+                    re_max_queue_time,
                     re_resource_units,
                 })
             } else {

app/buck2_core/src/execution_types/executor_config.rs

@@ -13,6 +13,7 @@ use std::hash::Hash;
 use std::hash::Hasher;
 use std::str::FromStr;
 use std::sync::Arc;
+use std::time::Duration;
 
 use allocative::Allocative;
 use buck2_error::BuckErrorContext;
@@ -145,7 +146,7 @@ impl FromStr for RemoteExecutorUseCase {
 #[derive(Debug, Default, Eq, PartialEq, Clone, Hash, Allocative)]
 pub struct RemoteExecutorOptions {
     pub re_max_input_files_bytes: Option<u64>,
-    pub re_max_queue_time_ms: Option<u64>,
+    pub re_max_queue_time: Option<Duration>,
     pub re_resource_units: Option<i64>,
 }
 

app/buck2_execute_impl/src/executors/re.rs

@@ -76,7 +76,7 @@ pub struct ReExecutor {
     pub knobs: ExecutorGlobalKnobs,
     pub skip_cache_read: bool,
     pub skip_cache_write: bool,
-    pub re_max_queue_time_ms: Option<u64>,
+    pub re_max_queue_time: Option<Duration>,
     pub re_resource_units: Option<i64>,
     pub paranoid: Option<ParanoidDownloader>,
     pub materialize_failed_inputs: bool,
@@ -173,7 +173,7 @@ impl ReExecutor {
                 &mut manager,
                 self.skip_cache_read,
                 self.skip_cache_write,
-                self.re_max_queue_time_ms.map(Duration::from_millis),
+                self.re_max_queue_time,
                 self.re_resource_units,
                 &self.knobs,
                 meta_internal_extra_params,

app/buck2_server/src/daemon/common.rs

@@ -225,7 +225,7 @@ impl HasCommandExecutor for CommandExecutorFactory {
                     materializer: self.materializer.dupe(),
                     re_client: self.get_prepared_re_client(*re_use_case),
                     re_action_key: re_action_key.clone(),
-                    re_max_queue_time_ms: options.re_max_queue_time_ms,
+                    re_max_queue_time: options.re_max_queue_time,
                     re_resource_units: options.re_resource_units,
                     knobs: self.executor_global_knobs.dupe(),
                     skip_cache_read: self.skip_cache_read || !remote_cache_enabled,