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.

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

fix build re-attempts after pre-build error #2605

Merged
merged 1 commit into from
Sep 16, 2024
Merged
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
125 changes: 88 additions & 37 deletions src/build_queue.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use crate::cdn;
use crate::db::{delete_crate, delete_version, update_latest_version_id, Pool};
use crate::docbuilder::PackageKind;
use crate::error::Result;
use crate::storage::Storage;
use crate::utils::{get_config, get_crate_priority, report_error, retry, set_config, ConfigName};
use crate::Context;
use crate::{cdn, BuildPackageSummary};
use crate::{Config, Index, InstanceMetrics, RustwideBuilder};
use anyhow::Context as _;
use fn_error_context::context;
Expand Down Expand Up @@ -168,7 +168,10 @@ impl BuildQueue {
.is_some())
}

fn process_next_crate(&self, f: impl FnOnce(&QueuedCrate) -> Result<()>) -> Result<()> {
fn process_next_crate(
&self,
f: impl FnOnce(&QueuedCrate) -> Result<BuildPackageSummary>,
) -> Result<()> {
let mut conn = self.db.get()?;
let mut transaction = conn.transaction()?;

Expand Down Expand Up @@ -204,44 +207,56 @@ impl BuildQueue {
None => return Ok(()),
};

let res = self.metrics.build_time.observe_closure_duration(|| {
f(&to_process).with_context(|| {
format!(
"Failed to build package {}-{} from queue",
to_process.name, to_process.version
)
})
});
let res = self
.metrics
.build_time
.observe_closure_duration(|| f(&to_process));

self.metrics.total_builds.inc();
if let Err(err) =
cdn::queue_crate_invalidation(&mut transaction, &self.config, &to_process.name)
{
report_error(&err);
}

match res {
Ok(()) => {
transaction.execute("DELETE FROM queue WHERE id = $1;", &[&to_process.id])?;
}
Err(e) => {
// Increase attempt count
let attempt: i32 = transaction
.query_one(
"UPDATE queue
let mut increase_attempt_count = || -> Result<()> {
let attempt: i32 = transaction
.query_one(
"UPDATE queue
SET
attempt = attempt + 1,
last_attempt = NOW()
WHERE id = $1
RETURNING attempt;",
&[&to_process.id],
)?
.get(0);
&[&to_process.id],
)?
.get(0);

if attempt >= self.max_attempts {
self.metrics.failed_builds.inc();
}
if attempt >= self.max_attempts {
self.metrics.failed_builds.inc();
}
Ok(())
};

report_error(&e);
match res {
Ok(BuildPackageSummary {
should_reattempt: false,
successful: _,
}) => {
transaction.execute("DELETE FROM queue WHERE id = $1;", &[&to_process.id])?;
}
Ok(BuildPackageSummary {
should_reattempt: true,
successful: _,
}) => {
increase_attempt_count()?;
}
Err(e) => {
increase_attempt_count()?;
report_error(&e.context(format!(
"Failed to build package {}-{} from queue",
to_process.name, to_process.version
)))
}
}

Expand Down Expand Up @@ -521,8 +536,7 @@ impl BuildQueue {
return Err(err);
}

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

Ok(processed)
Expand Down Expand Up @@ -644,7 +658,7 @@ mod tests {
queue.process_next_crate(|krate| {
assert_eq!(krate.name, "krate");
handled = true;
Ok(())
Ok(BuildPackageSummary::default())
})?;

assert!(handled);
Expand Down Expand Up @@ -680,7 +694,7 @@ mod tests {
let assert_next = |name| -> Result<()> {
queue.process_next_crate(|krate| {
assert_eq!(name, krate.name);
Ok(())
Ok(BuildPackageSummary::default())
})?;
Ok(())
};
Expand Down Expand Up @@ -720,7 +734,7 @@ mod tests {
let mut called = false;
queue.process_next_crate(|_| {
called = true;
Ok(())
Ok(BuildPackageSummary::default())
})?;
assert!(!called, "there were still items in the queue");

Expand Down Expand Up @@ -755,7 +769,7 @@ mod tests {

queue.process_next_crate(|krate| {
assert_eq!("will_succeed", krate.name);
Ok(())
Ok(BuildPackageSummary::default())
})?;

let queued_invalidations = cdn::queued_or_active_crate_invalidations(&mut *conn)?;
Expand Down Expand Up @@ -793,7 +807,7 @@ mod tests {

queue.process_next_crate(|krate| {
assert_eq!("foo", krate.name);
Ok(())
Ok(BuildPackageSummary::default())
})?;
assert_eq!(queue.pending_count()?, 1);

Expand All @@ -816,7 +830,7 @@ mod tests {

queue.process_next_crate(|krate| {
assert_eq!("bar", krate.name);
Ok(())
Ok(BuildPackageSummary::default())
})?;
assert_eq!(queue.prioritized_count()?, 1);

Expand All @@ -841,7 +855,7 @@ mod tests {
);

while queue.pending_count()? > 0 {
queue.process_next_crate(|_| Ok(()))?;
queue.process_next_crate(|_| Ok(BuildPackageSummary::default()))?;
}
assert!(queue.pending_count_by_priority()?.is_empty());

Expand All @@ -850,7 +864,44 @@ mod tests {
}

#[test]
fn test_failed_count() {
fn test_failed_count_for_reattempts() {
const MAX_ATTEMPTS: u16 = 3;
crate::test::wrapper(|env| {
env.override_config(|config| {
config.build_attempts = MAX_ATTEMPTS;
config.delay_between_build_attempts = Duration::ZERO;
});
let queue = env.build_queue();

assert_eq!(queue.failed_count()?, 0);
queue.add_crate("foo", "1.0.0", -100, None)?;
assert_eq!(queue.failed_count()?, 0);
queue.add_crate("bar", "1.0.0", 0, None)?;

for _ in 0..MAX_ATTEMPTS {
assert_eq!(queue.failed_count()?, 0);
queue.process_next_crate(|krate| {
assert_eq!("foo", krate.name);
Ok(BuildPackageSummary {
should_reattempt: true,
..Default::default()
})
})?;
}
assert_eq!(queue.failed_count()?, 1);

queue.process_next_crate(|krate| {
assert_eq!("bar", krate.name);
Ok(BuildPackageSummary::default())
})?;
assert_eq!(queue.failed_count()?, 1);

Ok(())
});
}

#[test]
fn test_failed_count_after_error() {
const MAX_ATTEMPTS: u16 = 3;
crate::test::wrapper(|env| {
env.override_config(|config| {
Expand All @@ -875,7 +926,7 @@ mod tests {

queue.process_next_crate(|krate| {
assert_eq!("bar", krate.name);
Ok(())
Ok(BuildPackageSummary::default())
})?;
assert_eq!(queue.failed_count()?, 1);

Expand Down
2 changes: 1 addition & 1 deletion src/docbuilder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ mod rustwide_builder;

pub(crate) use self::limits::Limits;
pub(crate) use self::rustwide_builder::DocCoverage;
pub use self::rustwide_builder::{PackageKind, RustwideBuilder};
pub use self::rustwide_builder::{BuildPackageSummary, PackageKind, RustwideBuilder};
Loading
Loading