Skip to content

Commit c643593

Browse files
KobzolKobzol
authored
Merge pull request #275 from Sakib25800/add-async-merge-checks
Add to mergeable queue on PR push, open and reopen
2 parents ea094b6 + c0ce5fc commit c643593

File tree

7 files changed

+109
-22
lines changed

7 files changed

+109
-22
lines changed

‎src/bors/handlers/info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub(super) async fn command_info(
1212
) -> anyhow::Result<()> {
1313
// Geting PR info from database
1414
let pr_model = db
15-
.get_or_create_pull_request(
15+
.upsert_pull_request(
1616
repo.client.repository(),
1717
pr.number,
1818
&pr.base.name,

‎src/bors/handlers/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@ pub async fn handle_bors_repository_event(
140140
let span =
141141
tracing::info_span!("Pull request pushed", repo = payload.repository.to_string());
142142

143-
handle_push_to_pull_request(repo, db, payload)
143+
handle_push_to_pull_request(repo, db, mergeable_queue_tx, payload)
144144
.instrument(span.clone())
145145
.await?;
146146
}
147147
BorsRepositoryEvent::PullRequestOpened(payload) => {
148148
let span =
149149
tracing::info_span!("Pull request opened", repo = payload.repository.to_string());
150150

151-
handle_pull_request_opened(repo, db, payload)
151+
handle_pull_request_opened(repo, db, mergeable_queue_tx, payload)
152152
.instrument(span.clone())
153153
.await?;
154154
}
@@ -174,7 +174,7 @@ pub async fn handle_bors_repository_event(
174174
repo = payload.repository.to_string()
175175
);
176176

177-
handle_pull_request_reopened(repo, db, payload)
177+
handle_pull_request_reopened(repo, db, mergeable_queue_tx, payload)
178178
.instrument(span.clone())
179179
.await?;
180180
}
@@ -503,7 +503,7 @@ async fn has_permission(
503503
}
504504

505505
let pr_model = db
506-
.get_or_create_pull_request(
506+
.upsert_pull_request(
507507
repo_state.repository(),
508508
pr.number,
509509
&pr.base.name,

‎src/bors/handlers/pr_events.rs

Lines changed: 93 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub(super) async fn handle_pull_request_edited(
2020
let pr = &payload.pull_request;
2121
let pr_number = pr.number;
2222
let pr_model = db
23-
.get_or_create_pull_request(
23+
.upsert_pull_request(
2424
repo_state.repository(),
2525
pr_number,
2626
&pr.base.name,
@@ -48,12 +48,13 @@ pub(super) async fn handle_pull_request_edited(
4848
pub(super) async fn handle_push_to_pull_request(
4949
repo_state: Arc<RepositoryState>,
5050
db: Arc<PgDbClient>,
51+
mergeable_queue: MergeableQueueSender,
5152
payload: PullRequestPushed,
5253
) -> anyhow::Result<()> {
5354
let pr = &payload.pull_request;
5455
let pr_number = pr.number;
5556
let pr_model = db
56-
.get_or_create_pull_request(
57+
.upsert_pull_request(
5758
repo_state.repository(),
5859
pr_number,
5960
&pr.base.name,
@@ -62,6 +63,8 @@ pub(super) async fn handle_push_to_pull_request(
6263
)
6364
.await?;
6465

66+
mergeable_queue.enqueue(repo_state.repository().clone(), pr_number);
67+
6568
if !pr_model.is_approved() {
6669
return Ok(());
6770
}
@@ -74,6 +77,7 @@ pub(super) async fn handle_push_to_pull_request(
7477
pub(super) async fn handle_pull_request_opened(
7578
repo_state: Arc<RepositoryState>,
7679
db: Arc<PgDbClient>,
80+
mergeable_queue: MergeableQueueSender,
7781
payload: PullRequestOpened,
7882
) -> anyhow::Result<()> {
7983
let pr_status = if payload.draft {
@@ -87,7 +91,11 @@ pub(super) async fn handle_pull_request_opened(
8791
&payload.pull_request.base.name,
8892
pr_status,
8993
)
90-
.await
94+
.await?;
95+
96+
mergeable_queue.enqueue(repo_state.repository().clone(), payload.pull_request.number);
97+
98+
Ok(())
9199
}
92100

93101
pub(super) async fn handle_pull_request_closed(
@@ -119,14 +127,23 @@ pub(super) async fn handle_pull_request_merged(
119127
pub(super) async fn handle_pull_request_reopened(
120128
repo_state: Arc<RepositoryState>,
121129
db: Arc<PgDbClient>,
130+
mergeable_queue: MergeableQueueSender,
122131
payload: PullRequestReopened,
123132
) -> anyhow::Result<()> {
124-
db.set_pr_status(
133+
let pr = &payload.pull_request;
134+
let pr_number = pr.number;
135+
db.upsert_pull_request(
125136
repo_state.repository(),
126-
payload.pull_request.number,
127-
PullRequestStatus::Open,
137+
pr_number,
138+
&pr.base.name,
139+
pr.mergeable_state.clone().into(),
140+
&pr.status,
128141
)
129-
.await
142+
.await?;
143+
144+
mergeable_queue.enqueue(repo_state.repository().clone(), pr_number);
145+
146+
Ok(())
130147
}
131148

132149
pub(super) async fn handle_pull_request_converted_to_draft(
@@ -506,4 +523,73 @@ mod tests {
506523
})
507524
.await;
508525
}
526+
527+
#[sqlx::test]
528+
async fn enqueue_prs_on_pr_opened(pool: sqlx::PgPool) {
529+
run_test(pool, |mut tester| async {
530+
tester.open_pr(default_repo_name(), false).await?;
531+
tester
532+
.wait_for_default_pr(|pr| pr.mergeable_state == MergeableState::Unknown)
533+
.await?;
534+
tester
535+
.default_repo()
536+
.lock()
537+
.get_pr_mut(default_pr_number())
538+
.mergeable_state = OctocrabMergeableState::Dirty;
539+
tester
540+
.wait_for_default_pr(|pr| pr.mergeable_state == MergeableState::HasConflicts)
541+
.await?;
542+
Ok(tester)
543+
})
544+
.await;
545+
}
546+
547+
#[sqlx::test]
548+
async fn enqueue_prs_on_pr_reopened(pool: sqlx::PgPool) {
549+
run_test(pool, |mut tester| async {
550+
tester
551+
.default_repo()
552+
.lock()
553+
.get_pr_mut(default_pr_number())
554+
.mergeable_state = OctocrabMergeableState::Unknown;
555+
tester
556+
.reopen_pr(default_repo_name(), default_pr_number())
557+
.await?;
558+
tester
559+
.wait_for_default_pr(|pr| pr.mergeable_state == MergeableState::Unknown)
560+
.await?;
561+
tester
562+
.default_repo()
563+
.lock()
564+
.get_pr_mut(default_pr_number())
565+
.mergeable_state = OctocrabMergeableState::Dirty;
566+
tester
567+
.wait_for_default_pr(|pr| pr.mergeable_state == MergeableState::HasConflicts)
568+
.await?;
569+
Ok(tester)
570+
})
571+
.await;
572+
}
573+
574+
#[sqlx::test]
575+
async fn enqueue_prs_on_push_to_pr(pool: sqlx::PgPool) {
576+
run_test(pool, |mut tester| async {
577+
tester
578+
.push_to_pr(default_repo_name(), default_pr_number())
579+
.await?;
580+
tester
581+
.wait_for_default_pr(|pr| pr.mergeable_state == MergeableState::Unknown)
582+
.await?;
583+
tester
584+
.default_repo()
585+
.lock()
586+
.get_pr_mut(default_pr_number())
587+
.mergeable_state = OctocrabMergeableState::Dirty;
588+
tester
589+
.wait_for_default_pr(|pr| pr.mergeable_state == MergeableState::HasConflicts)
590+
.await?;
591+
Ok(tester)
592+
})
593+
.await;
594+
}
509595
}

‎src/bors/handlers/review.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub(super) async fn command_approve(
4141
sha: pr.head.sha.to_string(),
4242
};
4343
let pr_model = db
44-
.get_or_create_pull_request(
44+
.upsert_pull_request(
4545
repo_state.repository(),
4646
pr.number,
4747
&pr.base.name,
@@ -70,7 +70,7 @@ pub(super) async fn command_unapprove(
7070
return Ok(());
7171
};
7272
let pr_model = db
73-
.get_or_create_pull_request(
73+
.upsert_pull_request(
7474
repo_state.repository(),
7575
pr.number,
7676
&pr.base.name,
@@ -98,7 +98,7 @@ pub(super) async fn command_set_priority(
9898
return Ok(());
9999
};
100100
let pr_model = db
101-
.get_or_create_pull_request(
101+
.upsert_pull_request(
102102
repo_state.repository(),
103103
pr.number,
104104
&pr.base.name,
@@ -129,7 +129,7 @@ pub(super) async fn command_delegate(
129129
}
130130

131131
let pr_model = db
132-
.get_or_create_pull_request(
132+
.upsert_pull_request(
133133
repo_state.repository(),
134134
pr.number,
135135
&pr.base.name,
@@ -155,7 +155,7 @@ pub(super) async fn command_undelegate(
155155
return Ok(());
156156
}
157157
let pr_model = db
158-
.get_or_create_pull_request(
158+
.upsert_pull_request(
159159
repo_state.repository(),
160160
pr.number,
161161
&pr.base.name,
@@ -181,7 +181,7 @@ pub(super) async fn command_set_rollup(
181181
return Ok(());
182182
}
183183
let pr_model = db
184-
.get_or_create_pull_request(
184+
.upsert_pull_request(
185185
repo_state.repository(),
186186
pr.number,
187187
&pr.base.name,

‎src/bors/handlers/trybuild.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub(super) async fn command_try_build(
5656
// Create pr model based on CI repo, so we can retrieve the pr later when
5757
// the CI repo emits events
5858
let pr_model = db
59-
.get_or_create_pull_request(
59+
.upsert_pull_request(
6060
repo.client.repository(),
6161
pr.number,
6262
&pr.base.name,
@@ -208,7 +208,7 @@ pub(super) async fn command_try_cancel(
208208

209209
let pr_number: PullRequestNumber = pr.number;
210210
let pr = db
211-
.get_or_create_pull_request(
211+
.upsert_pull_request(
212212
repo.client.repository(),
213213
pr_number,
214214
&pr.base.name,

‎src/database/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl PgDbClient {
9494
get_pull_request(&self.pool, repo, pr_number).await
9595
}
9696

97-
pub async fn get_or_create_pull_request(
97+
pub async fn upsert_pull_request(
9898
&self,
9999
repo: &GithubRepoName,
100100
pr_number: PullRequestNumber,

‎src/tests/mocks/bors.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use tower::Service;
1414

1515
use crate::bors::mergeable_queue::MergeableQueueSender;
1616
use crate::bors::{RollupMode, WAIT_FOR_REFRESH};
17-
use crate::database::{BuildStatus, DelegatedPermission, PullRequestModel};
17+
use crate::database::{BuildStatus, DelegatedPermission, OctocrabMergeableState, PullRequestModel};
1818
use crate::github::api::load_repositories;
1919
use crate::github::server::BorsProcess;
2020
use crate::github::{GithubRepoName, PullRequestNumber};
@@ -510,6 +510,7 @@ impl BorsTester {
510510
.get_mut(&pr_number)
511511
.expect("PR must be initialized before pushing to it");
512512
pr.head_sha = format!("pr-{pr_number}-commit-{counter}");
513+
pr.mergeable_state = OctocrabMergeableState::Unknown;
513514
pr.clone()
514515
};
515516

0 commit comments

Comments
 (0)