Skip to content

Commit

Permalink
fix bugs.
Browse files Browse the repository at this point in the history
  • Loading branch information
rkooo567 committed Dec 4, 2020
1 parent 7733b78 commit b7e34a1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion python/ray/log_monitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def update_log_filenames(self):
job_match = JOB_LOG_PATTERN.match(file_path)
if job_match:
job_id = job_match.group(2)
worker_pid = job_match.group(3)
worker_pid = int(job_match.group(3))
else:
job_id = None
worker_pid = None
Expand Down
4 changes: 1 addition & 3 deletions src/ray/core_worker/core_worker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1785,9 +1785,7 @@ Status CoreWorker::ExecuteTask(const TaskSpecification &task_spec,
task_type, task_spec.GetName(), func,
task_spec.GetRequiredResources().GetResourceMap(), args, arg_reference_ids,
return_ids, return_objects);
RAY_LOG(INFO) << "X-RAY-TRACE message:'TASK_DONE.' actor_id:" << task_spec.ActorId()
<< " job_id:" << task_spec.JobId() << " task_id:" << task_spec.TaskId()
<< " task_name:" << task_spec.GetName() << " worker_id:" << GetWorkerID();
RAY_LOG(INFO) << "X-RAY-TRACE message:'TASK_DONE.' task_id:" << task_spec.TaskId();
absl::optional<rpc::Address> caller_address(
options_.is_local_mode ? absl::optional<rpc::Address>()
: worker_context_.GetCurrentTask()->CallerAddress());
Expand Down
2 changes: 1 addition & 1 deletion src/ray/raylet/node_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1729,7 +1729,7 @@ void NodeManager::HandleRequestWorkerLease(const rpc::RequestWorkerLeaseRequest
reply->mutable_retry_at_raylet_address()->set_raylet_id(spillback_to.Binary());
metrics_num_task_spilled_back_ += 1;
RAY_LOG(INFO) << "X-RAY-TRACE message:'SPILLBACK.' from_node_id:" << self_node_id_
<< " to_node_id:" << spillback_to.Binary() << " task_id:" << task_id;
<< " to_node_id:" << spillback_to << " task_id:" << task_id;
send_reply_callback(Status::OK(), nullptr, nullptr);
});
task.OnCancellationInstead([reply, task_id, send_reply_callback]() {
Expand Down

0 comments on commit b7e34a1

Please sign in to comment.