danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

Merge pull request #456 from NixOS/retryon-bad-creds

Browse source 
Retry on bad creds
This commit is contained in:
Graham Christensen 2020-04-07 08:29:02 -04:00 committed by GitHub
parent b4989e44f8 3dc7498211
commit 284a7bfeaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ofborg/src/commitstatus.rs
View file

@ -71,23 +71,20 @@ impl<'a> CommitStatus<'a> {
#[derive(Debug)]
pub enum CommitStatusError {
ExpiredCreds(hubcaps::Error),
MissingSHA(hubcaps::Error),
Error(hubcaps::Error),
}
impl CommitStatusError {
pub fn is_internal_error(&self) -> bool {
match self {
CommitStatusError::MissingSHA(_) => false,
CommitStatusError::Error(_) => true,
}
}
}
impl From<hubcaps::Error> for CommitStatusError {
fn from(e: hubcaps::Error) -> CommitStatusError {
use hyper::status::StatusCode;
match e.kind() {
hubcaps::ErrorKind::Fault { code, error }
if code == &StatusCode::Unauthorized && error.message == "Bad credentials" =>
{
CommitStatusError::ExpiredCreds(e)
}
hubcaps::ErrorKind::Fault { code, error }
if code == &StatusCode::UnprocessableEntity
&& error.message.starts_with("No commit found for SHA:") =>

4
ofborg/src/message/evaluationjob.rs
View file

@ -20,6 +20,10 @@ impl EvaluationJob {
pub struct Actions {}
impl Actions {
pub fn retry_later(&mut self, _job: &EvaluationJob) -> worker::Actions {
vec![worker::Action::NackRequeue]
}
pub fn skip(&mut self, _job: &EvaluationJob) -> worker::Actions {
vec![worker::Action::Ack]
}

14
ofborg/src/tasks/evaluate.rs
View file

@ -226,13 +226,19 @@ impl<'a, E: stats::SysEvents + 'static> OneEval<'a, E> {
self.actions().skip(&self.job)
}
Err(Err(cswerr)) if !cswerr.is_internal_error() => {
error!("Ignorable error writing commit status: {:?}", cswerr);
Err(Err(CommitStatusError::ExpiredCreds(e))) => {
error!("Failed writing commit status: creds expired: {:?}", e);
self.actions().retry_later(&self.job)
}
Err(Err(CommitStatusError::MissingSHA(e))) => {
error!(
"Failed writing commit status: commit sha was force-pushed away: {:?}",
e
);
self.actions().skip(&self.job)
}
Err(Err(cswerr)) => {
Err(Err(CommitStatusError::Error(cswerr))) => {
error!(
"Internal error writing commit status: {:?}, marking internal error",
cswerr