Orion integrated with Scorpio. Added support for MR.#1252
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
There was a problem hiding this comment.
Pull Request Overview
This PR integrates Orion with Scorpio by adding merge request (MR) support to the build system. The changes enable the system to mount filesystems for specific merge requests before executing builds and implement retry logic for WebSocket message sending.
- Added MR field to build requests and WebSocket messages
- Implemented filesystem mounting functionality via HTTP API calls to Scorpio
- Added retry mechanism for WebSocket message transmission
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| orion/src/ws.rs | Added MR field to WSMessage enum and implemented send_with_retry function |
| orion/src/buck_controller.rs | Added mount_fs function and integrated MR parameter into build process |
| orion/src/api.rs | Extended BuildRequest struct to include MR field |
| orion/Cargo.toml | Added reqwest dependency for HTTP client functionality |
| orion-server/src/api.rs | Updated task handler to include MR field in messages |
| Ok(_) => return Ok(()), | ||
| Err(_) => { | ||
| if attempt == MAX_RETRIES { | ||
| return Err(format!("达到最大重试次数({}), ", MAX_RETRIES)); |
There was a problem hiding this comment.
The error message is incomplete - it ends with a comma and space but no additional information. Consider completing the message or removing the trailing comma.
| return Err(format!("达到最大重试次数({}), ", MAX_RETRIES)); | |
| return Err(format!("达到最大重试次数({})", MAX_RETRIES)); |
| } | ||
| } | ||
| } | ||
| unreachable!() |
There was a problem hiding this comment.
This unreachable!() statement is actually reachable. The loop can exit normally when attempt equals MAX_RETRIES, but the function doesn't return in that case, making this code reachable.
| unreachable!() |
| // Prepare the command to run | ||
| // Note: `args` is a list of additional arguments to pass to the `buck | ||
|
|
||
| let _ = mount_fs(&repo, &mr).await; |
There was a problem hiding this comment.
Silently ignoring the result of mount_fs could hide important errors. Consider handling the error appropriately, either by logging it or propagating it to the caller.
| let _ = mount_fs(&repo, &mr).await; | |
| if let Err(e) = mount_fs(&repo, &mr).await { | |
| tracing::error!("Failed to mount filesystem for repo {} and MR {}: {}", repo, mr, e); | |
| } |
|
|
||
| tracing::info!("Building {} in repo {} with target {}", id, repo, target); | ||
| // Prepare the command to run | ||
| // Note: `args` is a list of additional arguments to pass to the `buck |
There was a problem hiding this comment.
The comment is incomplete - it ends abruptly with 'the `buck'. Consider completing this comment or removing it.
| // Note: `args` is a list of additional arguments to pass to the `buck | |
| // Note: `args` is a list of additional arguments to pass to the `buck` command, | |
| // which is used to build the specified target in the given repository. |
|
|
||
| // Send POST request | ||
| let res = client | ||
| .post("http://localhost:2725/api/fs/mount") |
There was a problem hiding this comment.
The hardcoded URL 'http://localhost:2725/api/fs/mount' should be configurable through environment variables or configuration files to support different deployment environments.
| .post("http://localhost:2725/api/fs/mount") | |
| .post(&*MOUNT_API_URL) |
Signed-off-by: Xiaoyang Han <lux1an@qq.com>
No description provided.