Skip to content

fix: buck2 build use a fix target #1328

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

Merged
benjamin-747 merged 2 commits into from
Aug 11, 2025
Merged

fix: buck2 build use a fix target #1328

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
ecf10f9
fix: buck2 build use a fix target
yyjeqhc Aug 11, 2025
67a76e6
Merge branch 'main' into fix_extract_buck_target
genedna Aug 11, 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
106 changes: 57 additions & 49 deletions orion-server/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use crate::buck2::download_and_get_buck2_targets;
use crate::model::builds;
use crate::scheduler::{
BuildInfo, BuildRequest, TaskScheduler, WorkerInfo, WorkerStatus,
create_log_file, get_build_log_dir, TaskQueueStats
BuildInfo, BuildRequest, TaskQueueStats, TaskScheduler, WorkerInfo, WorkerStatus,
create_log_file, get_build_log_dir,
};
use axum::{
Json, Router,
Expand All @@ -19,10 +18,8 @@ use futures_util::{SinkExt, Stream, StreamExt, stream};
use orion::ws::WSMessage;
use rand::Rng;
use sea_orm::{
{
ActiveModelTrait, ActiveValue::Set, ColumnTrait, DatabaseConnection, EntityTrait,
QueryFilter as _,
},
ActiveModelTrait, ActiveValue::Set, ColumnTrait, DatabaseConnection, EntityTrait,
QueryFilter as _,
};
use serde::Serialize;
use std::convert::Infallible;
Expand All @@ -38,7 +35,6 @@ use tokio::sync::mpsc::UnboundedSender;
use utoipa::ToSchema;
use uuid::Uuid;


/// Enumeration of possible task statuses
#[derive(Debug, Serialize, Default, ToSchema)]
pub enum TaskStatusEnum {
Expand Down Expand Up @@ -69,20 +65,15 @@ pub struct AppState {

impl AppState {
/// Create new AppState instance
pub fn new(conn: DatabaseConnection, queue_config: Option<crate::scheduler::TaskQueueConfig>) -> Self {
pub fn new(
conn: DatabaseConnection,
queue_config: Option<crate::scheduler::TaskQueueConfig>,
) -> Self {
let workers = Arc::new(DashMap::new());
let active_builds = Arc::new(DashMap::new());
let scheduler = TaskScheduler::new(
conn.clone(),
workers,
active_builds,
queue_config,
);

Self {
scheduler,
conn,
}
let scheduler = TaskScheduler::new(conn.clone(), workers, active_builds, queue_config);

Self { scheduler, conn }
}
}

Expand Down Expand Up @@ -111,9 +102,7 @@ pub async fn start_queue_manager(state: AppState) {
(status = 200, description = "Queue statistics", body = TaskQueueStats)
)
)]
pub async fn queue_stats_handler(
State(state): State<AppState>,
) -> impl IntoResponse {
pub async fn queue_stats_handler(State(state): State<AppState>) -> impl IntoResponse {
let stats = state.scheduler.get_queue_stats().await;
(StatusCode::OK, Json(stats))
}
Expand Down Expand Up @@ -270,28 +259,33 @@ pub async fn task_handler(
Json(req): Json<BuildRequest>,
) -> impl IntoResponse {
// Download and get buck2 targets first
let target = match download_and_get_buck2_targets(&req.buck_hash, &req.buckconfig_hash).await {
Ok(target) => target,
Err(e) => {
tracing::error!("Failed to download buck2 targets: {}", e);
return (
StatusCode::INTERNAL_SERVER_ERROR,
Json(serde_json::json!({ "message": format!("Failed to download buck2 targets: {}", e) })),
).into_response();
}
};

// let target = match download_and_get_buck2_targets(&req.buck_hash, &req.buckconfig_hash).await {
// Ok(target) => target,
// Err(e) => {
// tracing::error!("Failed to download buck2 targets: {}", e);
// return (
// StatusCode::INTERNAL_SERVER_ERROR,
// Json(serde_json::json!({ "message": format!("Failed to download buck2 targets: {}", e) })),
// ).into_response();
// }
// };
// for now we do not extract from file, just use the fixed build target.

Copilot AI Aug 11, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment should include a TODO or FIXME marker to indicate this is temporary code that needs to be reverted, making it easier to track technical debt.

Suggested change
// for now we do not extract from file, just use the fixed build target.
// TODO: for now we do not extract from file, just use the fixed build target.

Copilot uses AI. Check for mistakes.
let target = "//...".to_string();

Copilot AI Aug 11, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The hardcoded target string should be defined as a constant to improve maintainability and make it easier to change when the temporary fix is removed.

Suggested change
let target = "//...".to_string();
let target = FIXED_BUILD_TARGET.to_string();

Copilot uses AI. Check for mistakes.

// Check if there are idle workers available
if state.scheduler.has_idle_workers() {
// Have idle workers, directly dispatch task (keep original logic)
handle_immediate_task_dispatch(state, req, target).await
} else {
// No idle workers, add task to queue
match state.scheduler.enqueue_task(req.clone(), target.clone()).await {
match state
.scheduler
.enqueue_task(req.clone(), target.clone())
.await
{
Ok(task_id) => {
tracing::info!("Task {} queued for later processing", task_id);

// Save to database (mark as Pending status)
let model = builds::ActiveModel {
build_id: Set(task_id),
Expand All @@ -304,19 +298,20 @@ pub async fn task_handler(
arguments: Set(req.args.clone().unwrap_or_default().join(" ")),
mr: Set(req.mr.clone().unwrap_or_default()),
};

if let Err(e) = model.insert(&state.conn).await {
tracing::error!("Failed to insert queued task into DB: {}", e);
}

(
StatusCode::OK,
Json(serde_json::json!({
"task_id": task_id.to_string(),
"task_id": task_id.to_string(),
"status": "queued",
"message": "Task queued for processing when workers become available"
})),
).into_response()
)
.into_response()
}
Err(e) => {
tracing::warn!("Failed to queue task: {}", e);
Expand All @@ -325,7 +320,8 @@ pub async fn task_handler(
Json(serde_json::json!({
"message": format!("Unable to queue task: {}", e)
})),
).into_response()
)
.into_response()
}
}
}
Expand All @@ -345,7 +341,8 @@ async fn handle_immediate_task_dispatch(
return (
StatusCode::SERVICE_UNAVAILABLE,
Json(serde_json::json!({"message": "No available workers at the moment"})),
).into_response();
)
.into_response();
}

// Randomly select an idle worker
Expand All @@ -364,7 +361,8 @@ async fn handle_immediate_task_dispatch(
return (
StatusCode::INTERNAL_SERVER_ERROR,
Json(serde_json::json!({"message": "Failed to create log file"})),
).into_response();
)
.into_response();
}
};

Expand Down Expand Up @@ -396,7 +394,8 @@ async fn handle_immediate_task_dispatch(
return (
StatusCode::INTERNAL_SERVER_ERROR,
Json(serde_json::json!({"message": "Failed to create task in database"})),
).into_response();
)
.into_response();
}

// Create WebSocket message for the worker
Expand All @@ -412,16 +411,24 @@ async fn handle_immediate_task_dispatch(
if let Some(mut worker) = state.scheduler.workers.get_mut(&chosen_id) {
if worker.sender.send(msg).is_ok() {
worker.status = WorkerStatus::Busy(task_id.to_string());
state.scheduler.active_builds.insert(task_id.to_string(), build_info);
tracing::info!("Task {} dispatched immediately to worker {}", task_id, chosen_id);
state
.scheduler
.active_builds
.insert(task_id.to_string(), build_info);
tracing::info!(
"Task {} dispatched immediately to worker {}",
task_id,
chosen_id
);
(
StatusCode::OK,
Json(serde_json::json!({
"task_id": task_id.to_string(),
"task_id": task_id.to_string(),
"client_id": chosen_id,
"status": "dispatched"
})),
).into_response()
)
.into_response()
} else {
tracing::error!(
"Failed to send task to supposedly idle worker {}. It might have just disconnected.",
Expand All @@ -442,7 +449,8 @@ async fn handle_immediate_task_dispatch(
(
StatusCode::INTERNAL_SERVER_ERROR,
Json(serde_json::json!({"message": "Internal scheduler error."})),
).into_response()
)
.into_response()
}
}

Expand Down Expand Up @@ -548,7 +556,7 @@ async fn process_message(
},
);
*worker_id = Some(id);

// After new worker registration, notify to process queued tasks
state.scheduler.notify_task_available();
} else {
Expand Down
Loading
Loading