Include UUID in ActionState

Changes the field used for identifying which action an ActionState corresponds to include a uuid as well as the ActionInfoHashKey. All existing functionality is kept the same by making use of the nested ActionInfoHashKey contained within the Id. These changes will provide the basis for all usage of Id in followup changes to the scheduler. This breaks compatibility for forwarding an operation from one remote execution system to another that does not use our operation name format (ie: very unlikely, but possible).
TraceMachina · May 29, 2024 · 9d3849c · 9d3849c
1 parent 08e2f2e
commit 9d3849c
Show file tree

Hide file tree

Showing 11 changed files with 212 additions and 103 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/deployment-examples/docker-compose/Dockerfile b/deployment-examples/docker-compose/Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update \
         DEBIAN_FRONTEND=noninteractive \
         apt-get install --no-install-recommends -y \
             npm=8.5.1~ds-1 \
-            git=1:2.34.1-1ubuntu1.10 \
+            git=1:2.34.1-1ubuntu1.11 \
             gcc=4:11.2.0-1ubuntu1 \
             g++=4:11.2.0-1ubuntu1 \
             python3=3.10.6-1~22.04 \
@@ -38,7 +38,7 @@ RUN apt-get update \
         DEBIAN_FRONTEND=noninteractive \
         apt-get install --no-install-recommends -y \
             npm=6.14.4+ds-1ubuntu2 \
-            git=1:2.25.1-1ubuntu3.11 \
+            git=1:2.25.1-1ubuntu3.12 \
             gcc=4:9.3.0-1ubuntu2 \
             g++=4:9.3.0-1ubuntu2 \
             python3=3.8.2-0ubuntu2 \

diff --git a/nativelink-scheduler/src/cache_lookup_scheduler.rs b/nativelink-scheduler/src/cache_lookup_scheduler.rs
@@ -25,7 +25,7 @@ use nativelink_proto::build::bazel::remote::execution::v2::{
 use nativelink_store::ac_utils::get_and_decode_digest;
 use nativelink_store::grpc_store::GrpcStore;
 use nativelink_util::action_messages::{
-    ActionInfo, ActionInfoHashKey, ActionResult, ActionStage, ActionState,
+    ActionInfo, ActionInfoHashKey, ActionResult, ActionStage, ActionState, OperationId,
 };
 use nativelink_util::background_spawn;
 use nativelink_util::common::DigestInfo;
@@ -130,12 +130,13 @@ impl ActionScheduler for CacheLookupScheduler {
         &self,
         action_info: ActionInfo,
     ) -> Result<watch::Receiver<Arc<ActionState>>, Error> {
+        let id = OperationId::new(action_info.unique_qualifier.clone());
         if action_info.skip_cache_lookup {
             // Cache lookup skipped, forward to the upstream.
             return self.action_scheduler.add_action(action_info).await;
         }
         let mut current_state = Arc::new(ActionState {
-            unique_qualifier: action_info.unique_qualifier.clone(),
+            id,
             stage: ActionStage::CacheCheck,
         });
         let (tx, rx) = watch::channel(current_state.clone());
@@ -172,7 +173,7 @@ impl ActionScheduler for CacheLookupScheduler {
                 Pin::new(ac_store.as_ref()),
                 *action_digest,
                 instance_name,
-                current_state.unique_qualifier.digest_function,
+                current_state.id.unique_qualifier.digest_function,
             )
             .await
             {

diff --git a/nativelink-scheduler/src/simple_scheduler.rs b/nativelink-scheduler/src/simple_scheduler.rs
@@ -28,6 +28,7 @@ use nativelink_config::schedulers::WorkerAllocationStrategy;
 use nativelink_error::{error_if, make_err, make_input_err, Code, Error, ResultExt};
 use nativelink_util::action_messages::{
     ActionInfo, ActionInfoHashKey, ActionResult, ActionStage, ActionState, ExecutionMetadata,
+    OperationId,
 };
 use nativelink_util::metrics_utils::{
     AsyncCounterWrapper, Collector, CollectorState, CounterWithTime, FuncCounterWrapper,
@@ -182,22 +183,29 @@ struct CompletedAction {
 
 impl Hash for CompletedAction {
     fn hash<H: Hasher>(&self, state: &mut H) {
-        ActionInfoHashKey::hash(&self.state.unique_qualifier, state);
+        OperationId::hash(&self.state.id, state);
     }
 }
 
 impl PartialEq for CompletedAction {
     fn eq(&self, other: &Self) -> bool {
-        ActionInfoHashKey::eq(&self.state.unique_qualifier, &other.state.unique_qualifier)
+        OperationId::eq(&self.state.id, &other.state.id)
     }
 }
 
 impl Eq for CompletedAction {}
 
+impl Borrow<OperationId> for CompletedAction {
+    #[inline]
+    fn borrow(&self) -> &OperationId {
+        &self.state.id
+    }
+}
+
 impl Borrow<ActionInfoHashKey> for CompletedAction {
     #[inline]
     fn borrow(&self) -> &ActionInfoHashKey {
-        &self.state.unique_qualifier
+        &self.state.id.unique_qualifier
     }
 }
 
@@ -291,9 +299,10 @@ impl SimpleSchedulerImpl {
         self.metrics.add_action_new_action_created.inc();
         // Action needs to be added to queue or is not cacheable.
         let action_info = Arc::new(action_info);
+        let id = OperationId::new(action_info.unique_qualifier.clone());
 
         let current_state = Arc::new(ActionState {
-            unique_qualifier: action_info.unique_qualifier.clone(),
+            id,
             stage: ActionStage::Queued,
         });
 

diff --git a/nativelink-scheduler/tests/action_messages_test.rs b/nativelink-scheduler/tests/action_messages_test.rs
@@ -23,6 +23,7 @@ use nativelink_proto::google::longrunning::{operation, Operation};
 use nativelink_proto::google::rpc::Status;
 use nativelink_util::action_messages::{
     ActionInfo, ActionInfoHashKey, ActionResult, ActionStage, ActionState, ExecutionMetadata,
+    OperationId,
 };
 use nativelink_util::common::DigestInfo;
 use nativelink_util::digest_hasher::DigestHasherFunc;
@@ -44,13 +45,15 @@ mod action_messages_tests {
 
     #[nativelink_test]
     async fn action_state_any_url_test() -> Result<(), Error> {
+        let unique_qualifier = ActionInfoHashKey {
+            instance_name: "foo_instance".to_string(),
+            digest_function: DigestHasherFunc::Sha256,
+            digest: DigestInfo::new([1u8; 32], 5),
+            salt: 0,
+        };
+        let id = OperationId::new(unique_qualifier);
         let action_state = ActionState {
-            unique_qualifier: ActionInfoHashKey {
-                instance_name: "foo_instance".to_string(),
-                digest_function: DigestHasherFunc::Sha256,
-                digest: DigestInfo::new([1u8; 32], 5),
-                salt: 0,
-            },
+            id,
             // Result is only populated if has_action_result.
             stage: ActionStage::Completed(ActionResult::default()),
         };

diff --git a/nativelink-scheduler/tests/cache_lookup_scheduler_test.rs b/nativelink-scheduler/tests/cache_lookup_scheduler_test.rs
@@ -30,7 +30,9 @@ use nativelink_scheduler::action_scheduler::ActionScheduler;
 use nativelink_scheduler::cache_lookup_scheduler::CacheLookupScheduler;
 use nativelink_scheduler::platform_property_manager::PlatformPropertyManager;
 use nativelink_store::memory_store::MemoryStore;
-use nativelink_util::action_messages::{ActionInfoHashKey, ActionResult, ActionStage, ActionState};
+use nativelink_util::action_messages::{
+    ActionInfoHashKey, ActionResult, ActionStage, ActionState, OperationId,
+};
 use nativelink_util::common::DigestInfo;
 use nativelink_util::digest_hasher::DigestHasherFunc;
 use nativelink_util::store_trait::Store;
@@ -97,7 +99,7 @@ mod cache_lookup_scheduler_tests {
             .await?;
         let (_forward_watch_channel_tx, forward_watch_channel_rx) =
             watch::channel(Arc::new(ActionState {
-                unique_qualifier: action_info.unique_qualifier.clone(),
+                id: OperationId::new(action_info.unique_qualifier.clone()),
                 stage: ActionStage::Queued,
             }));
         let mut skip_cache_action = action_info.clone();

diff --git a/nativelink-scheduler/tests/property_modifier_scheduler_test.rs b/nativelink-scheduler/tests/property_modifier_scheduler_test.rs
@@ -28,7 +28,7 @@ use nativelink_macro::nativelink_test;
 use nativelink_scheduler::action_scheduler::ActionScheduler;
 use nativelink_scheduler::platform_property_manager::PlatformPropertyManager;
 use nativelink_scheduler::property_modifier_scheduler::PropertyModifierScheduler;
-use nativelink_util::action_messages::{ActionInfoHashKey, ActionStage, ActionState};
+use nativelink_util::action_messages::{ActionInfoHashKey, ActionStage, ActionState, OperationId};
 use nativelink_util::common::DigestInfo;
 use nativelink_util::platform_properties::PlatformPropertyValue;
 use tokio::sync::watch;
@@ -74,7 +74,7 @@ mod property_modifier_scheduler_tests {
         let action_info = make_base_action_info(UNIX_EPOCH);
         let (_forward_watch_channel_tx, forward_watch_channel_rx) =
             watch::channel(Arc::new(ActionState {
-                unique_qualifier: action_info.unique_qualifier.clone(),
+                id: OperationId::new(action_info.unique_qualifier.clone()),
                 stage: ActionStage::Queued,
             }));
         let platform_property_manager = Arc::new(PlatformPropertyManager::new(HashMap::from([(
@@ -114,7 +114,7 @@ mod property_modifier_scheduler_tests {
             .insert(name.clone(), PlatformPropertyValue::Unknown(original_value));
         let (_forward_watch_channel_tx, forward_watch_channel_rx) =
             watch::channel(Arc::new(ActionState {
-                unique_qualifier: action_info.unique_qualifier.clone(),
+                id: OperationId::new(action_info.unique_qualifier.clone()),
                 stage: ActionStage::Queued,
             }));
         let platform_property_manager = Arc::new(PlatformPropertyManager::new(HashMap::from([(
@@ -151,7 +151,7 @@ mod property_modifier_scheduler_tests {
         let action_info = make_base_action_info(UNIX_EPOCH);
         let (_forward_watch_channel_tx, forward_watch_channel_rx) =
             watch::channel(Arc::new(ActionState {
-                unique_qualifier: action_info.unique_qualifier.clone(),
+                id: OperationId::new(action_info.unique_qualifier.clone()),
                 stage: ActionStage::Queued,
             }));
         let platform_property_manager = Arc::new(PlatformPropertyManager::new(HashMap::from([(
@@ -188,7 +188,7 @@ mod property_modifier_scheduler_tests {
         let action_info = make_base_action_info(UNIX_EPOCH);
         let (_forward_watch_channel_tx, forward_watch_channel_rx) =
             watch::channel(Arc::new(ActionState {
-                unique_qualifier: action_info.unique_qualifier.clone(),
+                id: OperationId::new(action_info.unique_qualifier.clone()),
                 stage: ActionStage::Queued,
             }));
         let platform_property_manager = Arc::new(PlatformPropertyManager::new(HashMap::from([(
@@ -223,7 +223,7 @@ mod property_modifier_scheduler_tests {
             .insert(name, PlatformPropertyValue::Unknown(value));
         let (_forward_watch_channel_tx, forward_watch_channel_rx) =
             watch::channel(Arc::new(ActionState {
-                unique_qualifier: action_info.unique_qualifier.clone(),
+                id: OperationId::new(action_info.unique_qualifier.clone()),
                 stage: ActionStage::Queued,
             }));
         let platform_property_manager = Arc::new(PlatformPropertyManager::new(HashMap::new()));