Skip to content

refactor: remove job_id #258

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
l45k wants to merge 1 commit into
base: alpha
Choose a base branch
from
Open

refactor: remove job_id #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions crates/worker/src/executor/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ mod process;

pub use parameter_server::ParameterServerExecutor;
pub use process::ProcessExecutor;
use uuid::Uuid;

use crate::{connector::ConnectorError, executor::parameter_server::TensorOpError};

Expand Down Expand Up @@ -41,7 +40,6 @@ pub trait JobExecutor {
&self,
job: hypha_messages::JobSpec,
cancel: CancellationToken,
job_id: Uuid,
scheduler: PeerId,
) -> impl Future<Output = Result<impl Execution, Error>> + Send;
}
Expand Down
2 changes: 1 addition & 1 deletion crates/worker/src/executor/parameter_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ impl JobExecutor for ParameterServerExecutor {
&self,
job: hypha_messages::JobSpec,
cancel: CancellationToken,
job_id: Uuid,
scheduler_id: PeerId,
) -> Result<ParameterServerExecution, Error> {
tracing::info!(job_spec = ?job, "Executing parameter server job");
let job_id = job.job_id;

let retry_strategy = ExponentialBackoff::from_millis(100)
.map(jitter) // add jitter to delays
Expand Down
1 change: 0 additions & 1 deletion crates/worker/src/executor/process.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ impl JobExecutor for ProcessExecutor {
&self,
job: hypha_messages::JobSpec,
cancel: CancellationToken,
_job_id: Uuid,
scheduler: PeerId,
) -> Result<ProcessExecution, Error> {
if !matches!(&job.executor, Executor::Train(_)) {
Expand Down
4 changes: 2 additions & 2 deletions crates/worker/src/job_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ impl JobManager {
self.config.clone(),
);
let execution = executor
.execute(spec.clone(), cancel_token.clone(), spec.job_id, scheduler)
.execute(spec.clone(), cancel_token.clone(), scheduler)
.await?;
let job = Job {
id,
Expand Down Expand Up @@ -143,7 +143,7 @@ impl JobManager {
self.work_dir_base.clone(),
);
let execution = executor
.execute(spec.clone(), cancel_token.clone(), spec.job_id, scheduler)
.execute(spec.clone(), cancel_token.clone(), scheduler)
.await?;
let job = Job {
id,
Expand Down