Skip to content

Commit

Permalink
Make call SchedulerServer::new once in ballista-scheduler process (#1537
Browse files Browse the repository at this point in the history
)

* Make call SchedulerServer::new once in ballista-scheduler process

* cargo fmt

* fix wrong annotation
  • Loading branch information
Ted-Jiang committed Jan 13, 2022
1 parent 794b92b commit cf76969
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
4 changes: 4 additions & 0 deletions ballista/rust/scheduler/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ impl SchedulerServer {
.as_millis(),
}
}

pub fn set_caller_ip(&mut self, ip: IpAddr) {
self.caller_ip = ip;
}
}

const INFLIGHT_TASKS_METRIC_NAME: &str = "inflight_tasks";
Expand Down
15 changes: 10 additions & 5 deletions ballista/rust/scheduler/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use ballista_scheduler::externalscaler::external_scaler_server::ExternalScalerSe
use futures::future::{self, Either, TryFutureExt};
use hyper::{server::conn::AddrStream, service::make_service_fn, Server};
use std::convert::Infallible;
use std::net::{IpAddr, Ipv4Addr};
use std::{net::SocketAddr, sync::Arc};
use tonic::transport::Server as TonicServer;
use tower::Service;
Expand Down Expand Up @@ -62,14 +63,18 @@ async fn start_server(
"Ballista v{} Scheduler listening on {:?}",
BALLISTA_VERSION, addr
);
//should only call SchedulerServer::new() once in the process
let scheduler_server_without_caller_ip = SchedulerServer::new(
config_backend.clone(),
namespace.clone(),
IpAddr::V4(Ipv4Addr::UNSPECIFIED),
);

Ok(Server::bind(&addr)
.serve(make_service_fn(move |request: &AddrStream| {
let scheduler_server = SchedulerServer::new(
config_backend.clone(),
namespace.clone(),
request.remote_addr().ip(),
);
let mut scheduler_server = scheduler_server_without_caller_ip.clone();
scheduler_server.set_caller_ip(request.remote_addr().ip());

let scheduler_grpc_server =
SchedulerGrpcServer::new(scheduler_server.clone());

Expand Down

0 comments on commit cf76969

Please sign in to comment.