-
Notifications
You must be signed in to change notification settings - Fork 650
Skip running a job if the crate/version deleted #11500
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
Open
YohDeadfall
wants to merge
1
commit into
rust-lang:main
Choose a base branch
from
YohDeadfall:skip-job-when-crate-deleted
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -39,7 +39,12 @@ impl BackgroundJob for SendPublishNotificationsJob { | |||||
let mut conn = ctx.deadpool.get().await?; | ||||||
|
||||||
// Get crate name, version and other publish details | ||||||
let publish_details = PublishDetails::for_version(version_id, &mut conn).await?; | ||||||
let Some(publish_details) = PublishDetails::for_version(version_id, &mut conn).await? | ||||||
else { | ||||||
warn!("Skipping publish notifications for {version_id}: no version found",); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
||||||
return Ok(()); | ||||||
}; | ||||||
|
||||||
let publish_time = publish_details | ||||||
.publish_time | ||||||
|
@@ -157,13 +162,17 @@ struct PublishDetails { | |||||
} | ||||||
|
||||||
impl PublishDetails { | ||||||
async fn for_version(version_id: i32, conn: &mut AsyncPgConnection) -> QueryResult<Self> { | ||||||
async fn for_version( | ||||||
version_id: i32, | ||||||
conn: &mut AsyncPgConnection, | ||||||
) -> QueryResult<Option<Self>> { | ||||||
versions::table | ||||||
.find(version_id) | ||||||
.inner_join(crates::table) | ||||||
.left_join(users::table) | ||||||
.select(PublishDetails::as_select()) | ||||||
.first(conn) | ||||||
.await | ||||||
.optional() | ||||||
} | ||||||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -3,7 +3,7 @@ use crate::worker::Environment; | |||||
use crates_io_worker::BackgroundJob; | ||||||
use serde::{Deserialize, Serialize}; | ||||||
use std::sync::Arc; | ||||||
use tracing::info; | ||||||
use tracing::{info, warn}; | ||||||
|
||||||
#[derive(Serialize, Deserialize)] | ||||||
pub struct UpdateDefaultVersion { | ||||||
|
@@ -28,8 +28,16 @@ impl BackgroundJob for UpdateDefaultVersion { | |||||
|
||||||
info!("Updating default version for crate {crate_id}"); | ||||||
let mut conn = ctx.deadpool.get().await?; | ||||||
update_default_version(crate_id, &mut conn).await?; | ||||||
let res = update_default_version(crate_id, &mut conn).await; | ||||||
if let Err(diesel::result::Error::DatabaseError( | ||||||
diesel::result::DatabaseErrorKind::ForeignKeyViolation, | ||||||
.., | ||||||
)) = res | ||||||
{ | ||||||
warn!("Skipping update default version for crate for {crate_id}: no crate found",); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
return Ok(()); | ||||||
} | ||||||
|
||||||
Ok(()) | ||||||
res.map_err(|e| e.into()) | ||||||
} | ||||||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.