Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions nativelink-config/src/cas_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,16 @@ pub struct AcStoreConfig {
/// it is only possible to read from the Action Cache.
#[serde(default)]
pub read_only: bool,

/// If set to true, `UpdateActionResult` requests whose `ActionResult` has
/// a non-zero exit code are acknowledged but not stored. A failed action
/// is then executed again instead of being served from the Action Cache,
/// so a transient failure (for example a network error) does not get
/// cached for every client.
///
/// Default: false
#[serde(default)]
pub discard_failed_results: bool,
}

#[derive(Deserialize, Serialize, Debug, Clone)]
Expand Down
11 changes: 11 additions & 0 deletions nativelink-service/src/ac_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use tracing::{Instrument, Level, error, error_span, instrument};
pub struct AcStoreInfo {
store: Store,
read_only: bool,
discard_failed_results: bool,
}

pub struct AcServer {
Expand Down Expand Up @@ -67,6 +68,7 @@ impl AcServer {
AcStoreInfo {
store,
read_only: config.read_only,
discard_failed_results: config.discard_failed_results,
},
);
}
Expand Down Expand Up @@ -139,6 +141,15 @@ impl AcServer {
.ok_or_else(|| make_input_err!("Action digest was not set in message"))?
.try_into()?;

// Acknowledge a failed result without storing it, so the action is
// executed again instead of being served from the cache.
if store_info.discard_failed_results
&& let Some(action_result) = &request.action_result
&& action_result.exit_code != 0
{
return Ok(Response::new(action_result.clone()));
}

// If we are a GrpcStore we shortcut here, as this is a special store.
if let Some(grpc_store) = store_info
.store
Expand Down
71 changes: 71 additions & 0 deletions nativelink-service/tests/ac_server_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,20 @@ async fn make_store_manager() -> Result<Arc<StoreManager>, Error> {
}

fn make_ac_server(store_manager: &StoreManager) -> Result<AcServer, Error> {
make_ac_server_with_discard(store_manager, false)
}

fn make_ac_server_with_discard(
store_manager: &StoreManager,
discard_failed_results: bool,
) -> Result<AcServer, Error> {
AcServer::new(
&[WithInstanceName {
instance_name: "foo_instance_name".to_string(),
config: nativelink_config::cas_server::AcStoreConfig {
ac_store: "main_ac".to_string(),
read_only: false,
discard_failed_results,
},
}],
store_manager,
Expand Down Expand Up @@ -275,3 +283,66 @@ async fn one_item_update_test() -> Result<(), Box<dyn core::error::Error>> {
assert_eq!(decoded_action_result, action_result);
Ok(())
}

#[nativelink_test]
async fn discard_failed_results_skips_failed_action() -> Result<(), Box<dyn core::error::Error>> {
let store_manager = make_store_manager().await?;
let ac_server = make_ac_server_with_discard(&store_manager, true)?;

let action_result = ActionResult {
exit_code: 45,
..Default::default()
};
let size_bytes = get_encoded_proto_size(&action_result)?
.try_into()
.unwrap_or(i64::MAX);

let raw_response = update_action_result(
&ac_server,
Digest {
hash: HASH1.to_string(),
size_bytes,
},
action_result.clone(),
)
.await;
assert!(
raw_response.is_ok(),
"Expected success, got error {raw_response:?}"
);

let err = get_action_result(&ac_server, HASH1, size_bytes)
.await
.unwrap_err();
assert_eq!(err.code(), Code::NotFound);
Ok(())
}

#[nativelink_test]
async fn discard_failed_results_keeps_successful_action() -> Result<(), Box<dyn core::error::Error>>
{
let store_manager = make_store_manager().await?;
let ac_server = make_ac_server_with_discard(&store_manager, true)?;

let action_result = ActionResult {
exit_code: 0,
..Default::default()
};
let size_bytes = get_encoded_proto_size(&action_result)?
.try_into()
.unwrap_or(i64::MAX);

update_action_result(
&ac_server,
Digest {
hash: HASH1.to_string(),
size_bytes,
},
action_result.clone(),
)
.await?;

let response = get_action_result(&ac_server, HASH1, size_bytes).await?;
assert_eq!(response.into_inner(), action_result);
Ok(())
}