Upgrade arrow to include more detailed flushing message (#2706)

src/local_scheduler/test/run_tests.sh

@@ -30,9 +30,9 @@ sleep 1s
 ./src/common/thirdparty/redis/src/redis-cli set NumRedisShards 1
 ./src/common/thirdparty/redis/src/redis-cli rpush RedisShards 127.0.0.1:6380
 
-./src/plasma/plasma_store -s /tmp/plasma_store_socket_1 -m 100000000 &
+./src/plasma/plasma_store_server -s /tmp/plasma_store_socket_1 -m 100000000 &
 sleep 0.5s
 ./src/local_scheduler/local_scheduler_tests
 ./src/common/thirdparty/redis/src/redis-cli shutdown
 ./src/common/thirdparty/redis/src/redis-cli -p 6380 shutdown
-killall plasma_store
+killall plasma_store_server

src/local_scheduler/test/run_valgrind.sh

@@ -33,9 +33,9 @@ sleep 1s
 ./src/common/thirdparty/redis/src/redis-cli set NumRedisShards 1
 ./src/common/thirdparty/redis/src/redis-cli rpush RedisShards 127.0.0.1:6380
 
-./src/plasma/plasma_store -s /tmp/plasma_store_socket_1 -m 100000000 &
+./src/plasma/plasma_store_server -s /tmp/plasma_store_socket_1 -m 100000000 &
 sleep 0.5s
 valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all --leak-check-heuristics=stdstring --error-exitcode=1 ./src/local_scheduler/local_scheduler_tests
 ./src/common/thirdparty/redis/src/redis-cli shutdown
 ./src/common/thirdparty/redis/src/redis-cli -p 6380 shutdown
-killall plasma_store
+killall plasma_store_server

src/plasma/test/run_tests.sh

@@ -3,10 +3,10 @@
 # Cause the script to exit if a single command fails.
 set -e
 
-./src/plasma/plasma_store -s /tmp/plasma_store_socket_1 -m 0 &
+./src/plasma/plasma_store_server -s /tmp/plasma_store_socket_1 -m 0 &
 sleep 1
 ./src/plasma/manager_tests
-killall plasma_store
+killall plasma_store_server
 
 LaunchRedis() {
     port=$1
@@ -37,11 +37,11 @@ sleep 1s
 ./src/common/thirdparty/redis/src/redis-cli set NumRedisShards 1
 ./src/common/thirdparty/redis/src/redis-cli rpush RedisShards 127.0.0.1:6380
 sleep 1
-./src/plasma/plasma_store -s /tmp/store1 -m 1000000000 &
+./src/plasma/plasma_store_server -s /tmp/store1 -m 1000000000 &
 plasma1_pid=$!
 ./src/plasma/plasma_manager -m /tmp/manager1 -s /tmp/store1 -h 127.0.0.1 -p 11111 -r 127.0.0.1:6379 &
 plasma2_pid=$!
-./src/plasma/plasma_store -s /tmp/store2 -m 1000000000 &
+./src/plasma/plasma_store_server -s /tmp/store2 -m 1000000000 &
 plasma3_pid=$!
 ./src/plasma/plasma_manager -m /tmp/manager2 -s /tmp/store2 -h 127.0.0.1 -p 22222 -r 127.0.0.1:6379 &
 plasma4_pid=$!

src/plasma/test/run_valgrind.sh

@@ -5,7 +5,7 @@ set -x
 # Cause the script to exit if a single command fails.
 set -e
 
-./src/plasma/plasma_store -s /tmp/plasma_store_socket_1 -m 0 &
+./src/plasma/plasma_store_server -s /tmp/plasma_store_socket_1 -m 0 &
 sleep 1
 valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all --leak-check-heuristics=stdstring --error-exitcode=1 ./src/plasma/manager_tests
-killall plasma_store
+killall plasma_store_server

src/ray/raylet/object_manager_integration_test.cc

@@ -83,7 +83,7 @@ class TestObjectManagerBase : public ::testing::Test {
     this->server1.reset();
     this->server2.reset();
 
-    int s = system("killall plasma_store &");
+    int s = system("killall plasma_store_server &");
     ASSERT_TRUE(!s);
 
     std::string cmd_str = test_executable.substr(0, test_executable.find_last_of("/"));

src/ray/test/run_object_manager_tests.sh

@@ -34,7 +34,7 @@ else
     LOAD_MODULE_ARGS="--loadmodule ${REDIS_MODULE}"
 fi
 
-STORE_EXEC="$CORE_DIR/src/plasma/plasma_store"
+STORE_EXEC="$CORE_DIR/src/plasma/plasma_store_server"
 
 # Allow cleanup commands to fail.
 $REDIS_DIR/redis-cli -p 6379 shutdown || true

src/ray/test/run_object_manager_valgrind.sh

@@ -23,7 +23,7 @@ fi
 CORE_DIR="$RAY_ROOT/build"
 REDIS_DIR="$CORE_DIR/src/common/thirdparty/redis/src"
 REDIS_MODULE="$CORE_DIR/src/common/redis_module/libray_redis_module.so"
-STORE_EXEC="$CORE_DIR/src/plasma/plasma_store"
+STORE_EXEC="$CORE_DIR/src/plasma/plasma_store_server"
 VALGRIND_CMD="valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all --leak-check-heuristics=stdstring --error-exitcode=1"
 
 if [[ "${RAY_USE_NEW_GCS}" = "on" ]]; then

src/ray/test/start_raylet.sh

@@ -21,7 +21,7 @@ if [[ `stat $STORE_SOCKET_NAME` ]]; then
   rm $STORE_SOCKET_NAME
 fi
 
-./src/plasma/plasma_store -m 1000000000 -s $STORE_SOCKET_NAME &
+./src/plasma/plasma_store_server -m 1000000000 -s $STORE_SOCKET_NAME &
 ./src/ray/raylet/raylet $RAYLET_SOCKET_NAME $STORE_SOCKET_NAME 127.0.0.1 127.0.0.1 6379 &
 
 echo

src/ray/test/start_raylets.sh

@@ -43,7 +43,7 @@ for i in `seq 1 $NUM_RAYLETS`; do
     rm $STORE_SOCKET_NAME
   fi
 
-  ./src/plasma/plasma_store -m 1000000000 -s $STORE_SOCKET_NAME &
+  ./src/plasma/plasma_store_server -m 1000000000 -s $STORE_SOCKET_NAME &
   ./src/ray/raylet/raylet $RAYLET_SOCKET_NAME $STORE_SOCKET_NAME 127.0.0.1 127.0.0.1 6379 &
 
   echo