wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-06-28 19:01:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix code_search_path failed in java (#11406)

Browse Source 
Co-authored-by: xujiqiang eigen <xujiqiang@hpc1.ipa.aidigger.com>
This commit is contained in:
Xuxue1
2020-10-21 18:10:48 +08:00
committed by GitHub
parent aeea168940
commit 7200ddb72d
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ray/raylet/worker_pool.cc
+1 -1
View File
@@ -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:
src/ray/raylet/worker_pool_test.cc
+19 -3
View File
@@ -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<std::string>(
{"test_op_0", "test_op_1", "dummy_java_worker_command",
GetNumJavaWorkersPerProcessSystemProperty(1)}));
if (RayConfig::instance().enable_multi_tenancy()) {
ASSERT_EQ(
real_command,
std::vector<std::string>(
{"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<std::string>(
{"test_op_0", "test_op_1", "dummy_java_worker_command",
GetNumJavaWorkersPerProcessSystemProperty(1)}));
}
worker_pool_->HandleJobFinished(JOB_ID);
}
TEST_P(WorkerPoolTest, PopWorkerMultiTenancy) {