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

Debug statements and increase timeout for test array (#7713)

Browse Source
This commit is contained in:
Stephanie Wang
2020-03-23 13:02:14 -07:00
committed by GitHub
parent 9a590ac6a5
commit 7f38cc1d03
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ray/core_worker/core_worker.cc
+3 -1
View File
@@ -115,7 +115,6 @@ CoreWorker::CoreWorker(const WorkerType worker_type, const Language language,
RayLog::StartRayLog(app_name.str(), RayLogLevel::INFO, log_dir_);
RayLog::InstallFailureSignalHandler();
}
RAY_LOG(INFO) << "Initializing worker " << worker_context_.GetWorkerID();
// Initialize gcs client.
if (getenv("RAY_GCS_SERVICE_ENABLED") != nullptr) {
gcs_client_ = std::make_shared<ray::gcs::ServiceBasedGcsClient>(gcs_options);
@@ -169,6 +168,9 @@ CoreWorker::CoreWorker(const WorkerType worker_type, const Language language,
rpc_address_.set_port(core_worker_server_.GetPort());
rpc_address_.set_raylet_id(local_raylet_id.Binary());
rpc_address_.set_worker_id(worker_context_.GetWorkerID().Binary());
RAY_LOG(INFO) << "Initializing worker at address: " << rpc_address_.ip_address() << ":"
<< rpc_address_.port() << ", worker ID " << worker_context_.GetWorkerID()
<< ", raylet " << local_raylet_id;
reference_counter_ = std::make_shared<ReferenceCounter>(
rpc_address_, RayConfig::instance().distributed_ref_counting_enabled(),
src/ray/core_worker/reference_count.cc
+9 -6
View File
@@ -509,8 +509,8 @@ void ReferenceCounter::MergeRemoteBorrowers(const ObjectID &object_id,
auto inserted = it->second.borrowers.insert(worker_addr).second;
// If we are the owner of id, then send WaitForRefRemoved to borrower.
if (inserted) {
RAY_LOG(DEBUG) << "Adding borrower " << worker_addr.ip_address << " to id "
<< object_id;
RAY_LOG(DEBUG) << "Adding borrower " << worker_addr.ip_address << ":"
<< worker_addr.port << " to id " << object_id;
new_borrowers.push_back(worker_addr);
}
}
@@ -519,8 +519,8 @@ void ReferenceCounter::MergeRemoteBorrowers(const ObjectID &object_id,
for (const auto &nested_borrower : borrower_ref.borrowers) {
auto inserted = it->second.borrowers.insert(nested_borrower).second;
if (inserted) {
RAY_LOG(DEBUG) << "Adding borrower " << nested_borrower.ip_address << " to id "
<< object_id;
RAY_LOG(DEBUG) << "Adding borrower " << nested_borrower.ip_address << ":"
<< nested_borrower.port << " to id " << object_id;
new_borrowers.push_back(nested_borrower);
}
}
@@ -624,8 +624,9 @@ void ReferenceCounter::AddNestedObjectIdsInternal(
// We do not own object_id. This is the case where we returned an object ID
// from a task, and the task's caller executed in a remote process.
for (const auto &inner_id : inner_ids) {
RAY_LOG(DEBUG) << "Adding borrower " << owner_address.ip_address << " to id "
<< inner_id << ", borrower owns outer ID " << object_id;
RAY_LOG(DEBUG) << "Adding borrower " << owner_address.ip_address << ":"
<< owner_address.port << " to id " << inner_id
<< ", borrower owns outer ID " << object_id;
auto inner_it = object_id_refs_.find(inner_id);
RAY_CHECK(inner_it != object_id_refs_.end());
// Add the task's caller as a borrower.
@@ -692,6 +693,8 @@ void ReferenceCounter::SetRefRemovedCallback(
}
if (it->second.RefCount() == 0) {
RAY_LOG(DEBUG) << "Ref count for borrowed object " << object_id
<< " is already 0, responding to WaitForRefRemoved";
// We already stopped borrowing the object ID. Respond to the owner
// immediately.
ref_removed_callback(object_id);