Skip to content

Fix inconsistency in read/write format of OperationId in Redis Scheduler Store #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkostyrev merged 1 commit into from
Jul 4, 2025
Merged

Fix inconsistency in read/write format of OperationId in Redis Scheduler Store #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion nativelink-scheduler/src/store_awaited_action_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@ impl SchedulerStoreKeyProvider for ClientIdToOperationId<'_> {
impl SchedulerStoreDecodeTo for ClientIdToOperationId<'_> {
type DecodeOutput = OperationId;
fn decode(_version: u64, data: Bytes) -> Result<Self::DecodeOutput, Error> {
OperationId::try_from(data).err_tip(|| "In ClientIdToOperationId::decode")
serde_json::from_slice(&data)
.map_err(|e| make_input_err!("In ClientIdToOperationId::decode - {e:?}"))
}
}

Expand Down
53 changes: 52 additions & 1 deletion nativelink-scheduler/tests/redis_store_awaited_action_db_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use nativelink_scheduler::awaited_action_db::{
use nativelink_scheduler::store_awaited_action_db::StoreAwaitedActionDb;
use nativelink_store::redis_store::{RedisStore, RedisSubscriptionManager};
use nativelink_util::action_messages::{
ActionInfo, ActionStage, ActionUniqueKey, ActionUniqueQualifier,
ActionInfo, ActionStage, ActionUniqueKey, ActionUniqueQualifier, OperationId,
};
use nativelink_util::common::DigestInfo;
use nativelink_util::digest_hasher::DigestHasherFunc;
Expand Down Expand Up @@ -196,6 +196,8 @@ async fn add_action_smoke_test() -> Result<(), Error> {
new_awaited_action
};

let worker_operation_id = OperationId::from(WORKER_OPERATION_ID);

let ft_aggregate_args = vec![
format!("aa__unique_qualifier__{SCRIPT_VERSION}").into(),
format!("@unique_qualifier:{{ {INSTANCE_NAME}_SHA256_0000000000000000000000000000000000000000000000000000000000000000_0_c }}").into(),
Expand Down Expand Up @@ -349,6 +351,43 @@ async fn add_action_smoke_test() -> Result<(), Error> {
])),
None,
)
.expect(
MockCommand {
cmd: Str::from_static("HMGET"),
subcommand: None,
args: vec![
format!("cid_{CLIENT_OPERATION_ID}").as_bytes().into(),
"version".as_bytes().into(),
"data".as_bytes().into(),
],
},
Ok(RedisValue::Array(vec![
// Version.
RedisValue::Null,
// Data.
RedisValue::Bytes(Bytes::from(serde_json::to_string(&worker_operation_id).unwrap())),
])),
None,
)
.expect(
MockCommand {
cmd: Str::from_static("HMGET"),
subcommand: None,
args: vec![
format!("aa_{WORKER_OPERATION_ID}").as_bytes().into(),
"version".as_bytes().into(),
"data".as_bytes().into(),
],
},
Ok(RedisValue::Array(vec![
// Version.
"2".into(),
// Data.
RedisValue::Bytes(Bytes::from(serde_json::to_string(&new_awaited_action).unwrap())),
])),
None,
)

.expect(
MockCommand {
cmd: Str::from_static("EVALSHA"),
Expand Down Expand Up @@ -453,6 +492,18 @@ async fn add_action_smoke_test() -> Result<(), Error> {
);
}

{
let get_subscription = awaited_action_db
.get_awaited_action_by_id(&OperationId::from(CLIENT_OPERATION_ID))
.await
.unwrap()
.unwrap();

let get_res = get_subscription.borrow().await;

assert_eq!(get_res.unwrap().state().stage, ActionStage::Executing);
}

{
// Update the action and check the new state.
let (changed_awaited_action_res, update_res) = tokio::join!(
Expand Down