Skip to content

Commit

Permalink
Revert "[core] add runtime env info to task spec debug string (ray-pr…
Browse files Browse the repository at this point in the history
…oject#20631)" (ray-project#20668)

This reverts commit e9132ed.

<!-- Thank you for your contribution! Please review https://github.com/ray-project/ray/blob/master/CONTRIBUTING.rst before opening a pull request. -->

<!-- Please add a reviewer to the assignee section when you create a PR. If you don't have the access to it, we will shortly find a reviewer and assign them to your PR. -->

## Why are these changes needed?

Seems to break Windows build. 

```
(07:46:25) ERROR: BUILD.bazel:406:11: Compiling src/ray/common/task/task_spec.cc failed: (Exit 2): cl.exe failed: error executing command
```

<img width="487" alt="Screen Shot 2021-11-23 at 3 09 18 AM" src="https://user-images.githubusercontent.com/18510752/143013973-f157724c-4951-49a9-80c6-158d41aa4295.png">


## Related issue number

<!-- For example: "Closes ray-project#1234" -->

## Checks

- [ ] I've run `scripts/format.sh` to lint the changes in this PR.
- [ ] I've included any doc changes needed for https://docs.ray.io/en/master/.
- [ ] I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failures at https://flakey-tests.ray.io/
- Testing Strategy
   - [ ] Unit tests
   - [ ] Release tests
   - [ ] This PR is not tested :(
  • Loading branch information
rkooo567 authored Nov 23, 2021
1 parent e9132ed commit 720bca8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
17 changes: 0 additions & 17 deletions src/ray/common/task/task_spec.cc
Original file line number Diff line number Diff line change
Expand Up @@ -387,23 +387,6 @@ std::string TaskSpecification::DebugString() const {
<< "}";
}

// Print runtime env.
if (HasRuntimeEnv()) {
const auto &runtime_env_info = RuntimeEnvInfo();
stream << ", serialized_runtime_env=" << SerializedRuntimeEnv();
const auto &uris = runtime_env_info.uris();
if (uris.size() > 0) {
stream << ", runtime_env_uris=";
for (const auto &uri : uris) {
stream << uri << ":";
}
// Erase the last ":"
stream.seekp(-1, std::ios_base::end);
}
stream << ", runtime_env_eager_install="
<< runtime_env_info.runtime_env_eager_install();
}

return stream.str();
}

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 @@ -1407,7 +1407,7 @@ std::vector<rpc::ObjectReference> CoreWorker::SubmitTask(
task_options.serialized_runtime_env, task_options.runtime_env_uris);
builder.SetNormalTaskSpec(max_retries, retry_exceptions);
TaskSpecification task_spec = builder.Build();
RAY_LOG(DEBUG) << "Submitting normal task " << task_spec.DebugString();
RAY_LOG(DEBUG) << "Submit task " << task_spec.DebugString();
std::vector<rpc::ObjectReference> returned_refs;
if (options_.is_local_mode) {
returned_refs = ExecuteTaskLocalMode(task_spec);
Expand Down Expand Up @@ -1493,7 +1493,6 @@ Status CoreWorker::CreateActor(const RayFunction &function,
<< "Actor " << actor_id << " already exists";
*return_actor_id = actor_id;
TaskSpecification task_spec = builder.Build();
RAY_LOG(DEBUG) << "Submitting actor creation task " << task_spec.DebugString();
if (options_.is_local_mode) {
// TODO(suquark): Should we consider namespace in local mode? Currently
// it looks like two actors with two different namespaces become the
Expand Down Expand Up @@ -1672,7 +1671,6 @@ std::vector<rpc::ObjectReference> CoreWorker::SubmitActorTask(

// Submit task.
TaskSpecification task_spec = builder.Build();
RAY_LOG(DEBUG) << "Submitting actor task " << task_spec.DebugString();
std::vector<rpc::ObjectReference> returned_refs;
if (options_.is_local_mode) {
returned_refs = ExecuteTaskLocalMode(task_spec, actor_id);
Expand Down

0 comments on commit 720bca8

Please sign in to comment.