From 7200ddb72dde2e42cf73864cf35ee4f8eb074bb7 Mon Sep 17 00:00:00 2001 From: Xuxue1 <1915998056@qq.com> Date: Wed, 21 Oct 2020 18:10:48 +0800 Subject: [PATCH] Fix code_search_path failed in java (#11406) Co-authored-by: xujiqiang eigen --- src/ray/raylet/worker_pool.cc | 2 +- src/ray/raylet/worker_pool_test.cc | 22 +++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/ray/raylet/worker_pool.cc b/src/ray/raylet/worker_pool.cc index 31a9cef74..8bf0a44af 100644 --- a/src/ray/raylet/worker_pool.cc +++ b/src/ray/raylet/worker_pool.cc @@ -238,7 +238,7 @@ Process WorkerPool::StartWorkerProcess(const Language &language, break; } case Language::JAVA: { - code_search_path_str = "-Dray.job.code-search-path" + code_search_path_str; + code_search_path_str = "-Dray.job.code-search-path=" + code_search_path_str; break; } default: diff --git a/src/ray/raylet/worker_pool_test.cc b/src/ray/raylet/worker_pool_test.cc index 2447668e1..47f2cbdd7 100644 --- a/src/ray/raylet/worker_pool_test.cc +++ b/src/ray/raylet/worker_pool_test.cc @@ -368,13 +368,29 @@ TEST_P(WorkerPoolTest, StartWorkerWithDynamicOptionsCommand) { TaskSpecification task_spec = ExampleTaskSpec( ActorID::Nil(), Language::JAVA, JOB_ID, ActorID::Of(JOB_ID, TaskID::ForDriverTask(JOB_ID), 1), {"test_op_0", "test_op_1"}); + + rpc::JobConfig job_config = rpc::JobConfig(); + job_config.add_code_search_path("/test/code_serch_path"); + job_config.set_num_java_workers_per_process(1); + worker_pool_->HandleJobStarted(JOB_ID, job_config); + worker_pool_->StartWorkerProcess(Language::JAVA, rpc::WorkerType::WORKER, JOB_ID, task_spec.DynamicWorkerOptions()); const auto real_command = worker_pool_->GetWorkerCommand(worker_pool_->LastStartedWorkerProcess()); - ASSERT_EQ(real_command, std::vector( - {"test_op_0", "test_op_1", "dummy_java_worker_command", - GetNumJavaWorkersPerProcessSystemProperty(1)})); + + if (RayConfig::instance().enable_multi_tenancy()) { + ASSERT_EQ( + real_command, + std::vector( + {"test_op_0", "test_op_1", "-Dray.job.code-search-path=/test/code_serch_path", + "dummy_java_worker_command", GetNumJavaWorkersPerProcessSystemProperty(1)})); + } else { + ASSERT_EQ(real_command, std::vector( + {"test_op_0", "test_op_1", "dummy_java_worker_command", + GetNumJavaWorkersPerProcessSystemProperty(1)})); + } + worker_pool_->HandleJobFinished(JOB_ID); } TEST_P(WorkerPoolTest, PopWorkerMultiTenancy) {