Remove merge queue lock

Author: Sakib25800

src/bors/merge_queue.rs

@@ -1,7 +1,6 @@
 use anyhow::anyhow;
 use octocrab::params::checks::{CheckRunConclusion, CheckRunStatus};
-use std::sync::{Arc, OnceLock};
-use tokio::sync::Mutex;
+use std::sync::Arc;
 
 use crate::{
     BorsContext,
@@ -14,7 +13,10 @@ use crate::{
         handlers::labels::handle_label_trigger,
     },
     database::{BuildStatus, MergeableState, PullRequestModel},
-    github::{CommitSha, LabelTrigger, MergeError, api::client::GithubRepositoryClient, api::operations::ForcePush},
+    github::{
+        CommitSha, LabelTrigger, MergeError, api::client::GithubRepositoryClient,
+        api::operations::ForcePush,
+    },
     utils::sort_queue::sort_queue_prs,
 };
 
@@ -26,8 +28,6 @@ pub(super) const AUTO_MERGE_BRANCH_NAME: &str = "automation/bors/auto-merge";
 /// This branch should run CI checks.
 pub(super) const AUTO_BRANCH_NAME: &str = "automation/bors/auto";
 
-static MERGE_QUEUE_LOCK: OnceLock<Mutex<()>> = OnceLock::new();
-
 pub type MergeQueueEvent = ();
 
 enum MergeResult {
@@ -36,10 +36,6 @@ enum MergeResult {
 }
 
 pub async fn handle_merge_queue(ctx: Arc<BorsContext>) -> anyhow::Result<()> {
-    // Prevent concurrent merge queue processing.
-    let lock = MERGE_QUEUE_LOCK.get_or_init(|| Mutex::new(()));
-    let _guard = lock.lock().await;
-
     let repos: Vec<Arc<RepositoryState>> =
         ctx.repositories.read().unwrap().values().cloned().collect();
 

src/github/api/client.rs

@@ -9,7 +9,7 @@ use crate::bors::{CheckSuite, CheckSuiteStatus, Comment};
 use crate::config::{CONFIG_FILE_PATH, RepositoryConfig};
 use crate::database::RunId;
 use crate::github::api::base_github_html_url;
-use crate::github::api::operations::{MergeError, merge_branches, set_branch_to_commit, ForcePush};
+use crate::github::api::operations::{ForcePush, MergeError, merge_branches, set_branch_to_commit};
 use crate::github::{CommitSha, GithubRepoName, PullRequest, PullRequestNumber};
 use crate::utils::timing::{measure_network_request, perform_network_request_with_retry};
 use futures::TryStreamExt;