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

Lock queue if updating toolchain fails #1307

Merged
merged 1 commit into from
Apr 4, 2021
Merged

Lock queue if updating toolchain fails #1307

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
6 changes: 6 additions & 0 deletions src/docbuilder/queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ impl DocBuilder {
.map(|r| PackageKind::Registry(r.as_str()))
.unwrap_or(PackageKind::CratesIo);

if let Err(err) = builder.update_toolchain() {
log::error!("Updating toolchain failed, locking queue: {}", err);
self.lock()?;
return Err(err);
}
Comment on lines +90 to +94
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than calling update_toolchain in more places, do you think it makes sense to change build_package to return an error enum so we can tell where the error came from? The current change seems racy: a new nightly could be published between calling update_toolchain here and calling it in build_package.

I'm also slightly concerned that this doesn't handle errors when an admin runs cratesfyi build crate, but I don't know a simple way to handle that, and it seems rare for that to be the first build with a new toolchain anyway.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was the approach I tried first, but I got stuck with working out how to make it work with failure, I could take another attempt.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, could you maybe add a new error type and try downcasting to that? Don't spend too much time on it :) this should work fine 99.9% of the time.


builder.build_package(&krate.name, &krate.version, kind)?;
Ok(())
})?;
Expand Down