Skip to content

Fix to acquire the permit in a blocking way #726

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.

Sign up for GitHub

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix to acquire the permit in a blocking way #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6373b1
fix: acquire permit blockingly
kozistr Sep 20, 2025
bcdeac3
update: increase buffer size
kozistr Sep 20, 2025
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
4 changes: 3 additions & 1 deletion core/src/queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ impl Queue {
max_concurrent_requests: usize,
) -> Self {
// Create channels
let (queue_sender, queue_receiver) = mpsc::channel(max_concurrent_requests);
// The queue rarely fails to send the QueueCommand due to a lack of buffer size.
// So, naively increasing the buffer size to twice than `max_concurrent_requests` to prevent the failure temporarily
let (queue_sender, queue_receiver) = mpsc::channel(2 * max_concurrent_requests);

// Launch background queue task
std::thread::spawn(move || {
Expand Down
28 changes: 22 additions & 6 deletions router/src/http/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ async fn predict(
info: Info,
permit: Option<OwnedSemaphorePermit>| async move {
let permit = match permit {
None => infer.acquire_permit().await,
None => infer.try_acquire_permit().map_err(ErrorResponse::from)?,
Some(permit) => permit,
};

Expand Down Expand Up @@ -347,7 +347,7 @@ async fn rerank(

// Closure for rerank
let rerank_inner = move |query: String, text: String, truncate: bool, infer: Infer| async move {
let permit = infer.acquire_permit().await;
let permit = infer.try_acquire_permit().map_err(ErrorResponse::from)?;

let response = infer
.predict(
Expand Down Expand Up @@ -672,8 +672,12 @@ async fn embed(

let local_infer = infer.clone();
let prompt_name = req.prompt_name.clone();

let permit = local_infer
.try_acquire_permit()
.map_err(ErrorResponse::from)?;

futures.push(async move {
let permit = local_infer.acquire_permit().await;
local_infer
.embed_pooled(
input,
Expand Down Expand Up @@ -855,8 +859,12 @@ async fn embed_sparse(

let local_infer = infer.clone();
let prompt_name = req.prompt_name.clone();

let permit = local_infer
.try_acquire_permit()
.map_err(ErrorResponse::from)?;

futures.push(async move {
let permit = local_infer.acquire_permit().await;
let response = local_infer
.embed_sparse(
input,
Expand Down Expand Up @@ -1029,8 +1037,12 @@ async fn embed_all(

let local_infer = infer.clone();
let prompt_name = req.prompt_name.clone();

let permit = local_infer
.try_acquire_permit()
.map_err(ErrorResponse::from)?;

futures.push(async move {
let permit = local_infer.acquire_permit().await;
local_infer
.embed_all(
input,
Expand Down Expand Up @@ -1223,8 +1235,12 @@ async fn openai_embed(
compute_chars += input.count_chars();

let local_infer = infer.clone();

let permit = local_infer
.try_acquire_permit()
.map_err(ErrorResponse::from)?;

futures.push(async move {
let permit = local_infer.acquire_permit().await;
local_infer
.embed_pooled(
input,
Expand Down