Skip to content
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.

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

refactor(stream): own and recreate shared context and local barrier manager in recovery #15157

Merged
merged 12 commits into from
Feb 27, 2024
2 changes: 1 addition & 1 deletion src/compute/src/rpc/service/config_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ impl ConfigService for ConfigServiceImpl {
) -> Result<Response<ShowConfigResponse>, Status> {
let batch_config = serde_json::to_string(self.batch_mgr.config())
.map_err(|e| e.to_status(Code::Internal, "compute"))?;
let stream_config = serde_json::to_string(&self.stream_mgr.context().config())
let stream_config = serde_json::to_string(&self.stream_mgr.env.config())
.map_err(|e| e.to_status(Code::Internal, "compute"))?;

let show_config_response = ShowConfigResponse {
Expand Down
4 changes: 2 additions & 2 deletions src/compute/src/rpc/service/exchange_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ impl ExchangeService for ExchangeServiceImpl {

let receiver = self
.stream_mgr
.context()
.take_receiver((up_actor_id, down_actor_id))?;
.take_receiver((up_actor_id, down_actor_id))
.await?;

// Map the remaining stream to add-permits.
let add_permits_stream = request_stream.map_ok(|req| match req.value.unwrap() {
Expand Down
2 changes: 1 addition & 1 deletion src/compute/src/rpc/service/stream_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ impl StreamService for StreamServiceImpl {
) -> std::result::Result<Response<BroadcastActorInfoTableResponse>, Status> {
let req = request.into_inner();

let res = self.mgr.update_actor_info(&req.info);
let res = self.mgr.update_actor_info(req.info).await;
match res {
Err(e) => {
error!(error = %e.as_report(), "failed to update actor info table actor");
Expand Down
Loading
Loading