Skip to content
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

Jump to bottom

fix: dry run missing tasks with no script #6473

Merged
merged 3 commits into from
Nov 16, 2023
Merged

fix: dry run missing tasks with no script #6473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efbd257
chore: make it clearn command isn't used aside from checking it's there
Nov 16, 2023
2d1f933
fix: only exit early when actually executing tasks
Nov 16, 2023
6027842
chore: fix lints introduced by mutability change
Nov 16, 2023
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
6 changes: 3 additions & 3 deletions crates/turborepo-cache/src/async_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ mod tests {
token: "my-token".to_string(),
team_slug: None,
});
let mut async_cache = AsyncCache::new(&opts, &repo_root_path, api_client, api_auth, None)?;
let async_cache = AsyncCache::new(&opts, &repo_root_path, api_client, api_auth, None)?;

// Ensure that the cache is empty
let response = async_cache.exists(&hash).await;
Expand Down Expand Up @@ -279,7 +279,7 @@ mod tests {
token: "my-token".to_string(),
team_slug: None,
});
let mut async_cache = AsyncCache::new(&opts, &repo_root_path, api_client, api_auth, None)?;
let async_cache = AsyncCache::new(&opts, &repo_root_path, api_client, api_auth, None)?;

// Ensure that the cache is empty
let response = async_cache.exists(&hash).await;
Expand Down Expand Up @@ -360,7 +360,7 @@ mod tests {
token: "my-token".to_string(),
team_slug: None,
});
let mut async_cache = AsyncCache::new(&opts, &repo_root_path, api_client, api_auth, None)?;
let async_cache = AsyncCache::new(&opts, &repo_root_path, api_client, api_auth, None)?;

// Ensure that the cache is empty
let response = async_cache.exists(&hash).await;
Expand Down
2 changes: 1 addition & 1 deletion crates/turborepo-lib/src/run/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ impl TaskCache {
Ok(log_writer)
}

pub async fn exists(&mut self) -> Result<Option<CacheHitMetadata>, CacheError> {
pub async fn exists(&self) -> Result<Option<CacheHitMetadata>, CacheError> {
self.run_cache.cache.exists(&self.hash).await
}

Expand Down
110 changes: 74 additions & 36 deletions crates/turborepo-lib/src/task_graph/visitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,45 +211,54 @@ impl<'a> Visitor<'a> {
info.clone(),
&task_hash,
);
// TODO(gsoltis): if/when we fix https://github.com/vercel/turbo/issues/937
// the following block should never get hit. In the meantime, keep it after
// hashing so that downstream tasks can count on the hash existing
//
// bail if the script doesn't exist
let Some(_command) = command else { continue };

let workspace_directory = self.repo_root.resolve(workspace_info.package_path());
// here is where we do the logic split
match self.dry {
true => {
let dry_run_exec_context =
factory.dry_run_exec_context(info.clone(), task_cache);
let tracker = self.run_tracker.track_task(info.into_owned());
tasks.push(tokio::spawn(async move {
dry_run_exec_context.execute_dry_run(tracker).await;
}));
}
false => {
// TODO(gsoltis): if/when we fix https://github.com/vercel/turbo/issues/937
// the following block should never get hit. In the meantime, keep it after
// hashing so that downstream tasks can count on the hash existing
//
// bail if the script doesn't exist
if command.is_none() {
continue;
}

let mut exec_context = factory.exec_context(
info.clone(),
task_hash,
task_cache,
workspace_directory,
execution_env,
);
let workspace_directory = self.repo_root.resolve(workspace_info.package_path());

let tracker = self.run_tracker.track_task(info.clone().into_owned());
let spaces_client = self.run_tracker.spaces_task_client();
let output_client = self.output_client();
let parent_span = Span::current();
let is_dry_run = self.dry;

if is_dry_run {
tasks.push(tokio::spawn(async move {
exec_context.execute_dry_run(tracker).await;
}));
} else {
tasks.push(tokio::spawn(async move {
exec_context
.execute(
parent_span.id(),
tracker,
output_client,
callback,
spaces_client,
)
.await;
}));
let mut exec_context = factory.exec_context(
info.clone(),
task_hash,
task_cache,
workspace_directory,
execution_env,
);

let tracker = self.run_tracker.track_task(info.clone().into_owned());
let spaces_client = self.run_tracker.spaces_task_client();
let output_client = self.output_client();
let parent_span = Span::current();

tasks.push(tokio::spawn(async move {
exec_context
.execute(
parent_span.id(),
tracker,
output_client,
callback,
spaces_client,
)
.await;
}));
}
}
}

Expand Down Expand Up @@ -552,6 +561,18 @@ impl<'a> ExecContextFactory<'a> {
errors: self.errors.clone(),
}
}

pub fn dry_run_exec_context(
&self,
task_id: TaskId<'static>,
task_cache: TaskCache,
) -> DryRunExecContext {
DryRunExecContext {
task_id,
task_cache,
hash_tracker: self.visitor.task_hasher.task_hash_tracker(),
}
}
}

struct ExecContext {
Expand Down Expand Up @@ -851,3 +872,20 @@ impl ExecContext {
}
}
}

struct DryRunExecContext {
task_id: TaskId<'static>,
task_cache: TaskCache,
hash_tracker: TaskHashTracker,
}

impl DryRunExecContext {
pub async fn execute_dry_run(&self, tracker: TaskTracker<()>) {
// may also need to do framework & command stuff?
if let Ok(Some(status)) = self.task_cache.exists().await {
self.hash_tracker
.insert_cache_status(self.task_id.clone(), status);
}
tracker.dry_run().await;
}
}
Loading