wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-09-10 12:38:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Actor resource backlog hotfix (#12471)

Browse Source 
* prepare implemented

* works?

* deflek

* git

* deflek round 2

* .

* improve the test

Co-authored-by: Alex <alex@anyscale.com>
Co-authored-by: Eric Liang <ekhliang@gmail.com>
This commit is contained in:
Alex Wu
2020-11-29 20:55:50 -08:00
committed by GitHub
co-authored by Alex Eric Liang
parent fb318addcb
commit f1cc33a6a6
3 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ray/gcs/gcs_server/gcs_actor_scheduler.cc
+6 -1
View File
@@ -35,6 +35,7 @@ GcsActorScheduler::GcsActorScheduler(
gcs_pub_sub_(std::move(gcs_pub_sub)),
schedule_failure_handler_(std::move(schedule_failure_handler)),
schedule_success_handler_(std::move(schedule_success_handler)),
report_worker_backlog_(RayConfig::instance().report_worker_backlog()),
lease_client_factory_(std::move(lease_client_factory)),
core_worker_clients_(client_factory) {
RAY_CHECK(schedule_failure_handler_ != nullptr && schedule_success_handler_ != nullptr);
@@ -208,6 +209,9 @@ void GcsActorScheduler::LeaseWorkerFromNode(std::shared_ptr<GcsActor> actor,
remote_address.set_ip_address(node->node_manager_address());
remote_address.set_port(node->node_manager_port());
auto lease_client = GetOrConnectLeaseClient(remote_address);
// Actor leases should be sent to the raylet immediately, so we should never build up a
// backlog in GCS.
int backlog_size = report_worker_backlog_ ? 0 : -1;
lease_client->RequestWorkerLease(
actor->GetCreationTaskSpecification(),
[this, node_id, actor, node](const Status &status,
@@ -247,7 +251,8 @@ void GcsActorScheduler::LeaseWorkerFromNode(std::shared_ptr<GcsActor> actor,
RetryLeasingWorkerFromNode(actor, node);
}
}
});
},
backlog_size);
}
void GcsActorScheduler::RetryLeasingWorkerFromNode(
src/ray/gcs/gcs_server/gcs_actor_scheduler.h
+2
View File
@@ -286,6 +286,8 @@ class GcsActorScheduler : public GcsActorSchedulerInterface {
std::function<void(std::shared_ptr<GcsActor>)> schedule_failure_handler_;
/// The handler to handle the successful scheduling.
std::function<void(std::shared_ptr<GcsActor>)> schedule_success_handler_;
/// Whether or not to report the backlog of actors waiting to be scheduled.
bool report_worker_backlog_;
/// Factory for producing new clients to request leases from remote nodes.
LeaseClientFactoryFn lease_client_factory_;
/// The nodes which are releasing unused workers.