From eca4cc7c00f2961273edfe83ac4a7138b3fc7657 Mon Sep 17 00:00:00 2001
From: Chaokun Yang <shawn.ck.yang@gmail.com>
Date: Fri, 20 Dec 2019 14:45:51 +0800
Subject: [PATCH] Fix plasma_store_server path (#6499)

---
 java/BUILD.bazel                                  | 15 ++++++++++++++-
 .../java/org/ray/runtime/runner/RunManager.java   |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/java/BUILD.bazel b/java/BUILD.bazel
index 1570d763c..35953bcc1 100644
--- a/java/BUILD.bazel
+++ b/java/BUILD.bazel
@@ -168,6 +168,19 @@ filegroup(
     ],
 )
 
+# plasma_store_server binary should be located in jar root path
+# and keep in sync with mvn resource
+genrule(
+    name = "cp_plasma_store_server",
+    srcs = [
+        "@plasma//:plasma_store_server",
+    ],
+    outs = ["plasma_store_server"],
+    cmd = """
+        cp -f $(location @plasma//:plasma_store_server) $@
+    """
+)
+
 filegroup(
     name = "java_native_deps",
     srcs = [
@@ -175,7 +188,7 @@ filegroup(
         "//:libray_redis_module.so",
         "//:raylet",
         "//:core_worker_library_java",
-        "@plasma//:plasma_store_server",
+        ":cp_plasma_store_server",
     ],
 )
 
diff --git a/java/runtime/src/main/java/org/ray/runtime/runner/RunManager.java b/java/runtime/src/main/java/org/ray/runtime/runner/RunManager.java
index a101ef5f9..6f825c383 100644
--- a/java/runtime/src/main/java/org/ray/runtime/runner/RunManager.java
+++ b/java/runtime/src/main/java/org/ray/runtime/runner/RunManager.java
@@ -353,7 +353,7 @@ public class RunManager {
 
   private void startObjectStore() {
     try (FileUtil.TempFile plasmaStoreFile = FileUtil
-        .getTempFileFromResource("external/plasma/plasma_store_server")) {
+        .getTempFileFromResource("plasma_store_server")) {
       plasmaStoreFile.getFile().setExecutable(true);
       List<String> command = ImmutableList.of(
           // The plasma store executable file.