A bunch of script changes, load credis when on

python/ray/services.py

@@ -496,8 +496,8 @@ def start_redis(node_ip_address,
                 cleanup=cleanup)
         else:
             assert num_redis_shards == 1, \
-                "For now, RAY_USE_NEW_GCS supports 1 shard, and credis supports" \
-                " 1-node chain for that shard only."
+                "For now, RAY_USE_NEW_GCS supports 1 shard, and credis "\
+                "supports 1-node chain for that shard only."
             redis_shard_port, _ = start_redis_instance(
                 node_ip_address=node_ip_address,
                 port=redis_shard_ports[i],

src/common/test/run_tests.sh

@@ -3,12 +3,29 @@
 # This needs to be run in the build tree, which is normally ray/build
 
 # Cause the script to exit if a single command fails.
-set -e
+set -ex
+
+LaunchRedis() {
+    port=$1
+    if [[ "${RAY_USE_NEW_GCS}" = "on" ]]; then
+        ./src/credis/redis/src/redis-server \
+            --loglevel warning \
+            --loadmodule ./src/credis/build/src/libmember.so \
+            --loadmodule ./src/common/redis_module/libray_redis_module.so \
+            --port $port &
+    else
+        ./src/common/thirdparty/redis/src/redis-server \
+            --loglevel warning \
+            --loadmodule ./src/common/redis_module/libray_redis_module.so \
+            --port $port &
+    fi
+    sleep 1s
+}
+
 
 # Start the Redis shards.
-./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6379 &
-./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6380 &
-sleep 1s
+LaunchRedis 6379
+LaunchRedis 6380
 # Register the shard location with the primary shard.
 ./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/common/test/run_valgrind.sh

@@ -7,22 +7,21 @@ set -x
 # Cause the script to exit if a single command fails.
 set -e
 
-# Start the Redis shards.
-./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6379 &
-./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6380 &
-sleep 1s
-# Register the shard location with the primary shard.
-./src/common/thirdparty/redis/src/redis-cli set NumRedisShards 1
-./src/common/thirdparty/redis/src/redis-cli rpush RedisShards 127.0.0.1:6380
-
 if [ -z "$RAY_USE_NEW_GCS" ]; then
+    # Start the Redis shards.
+    ./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6379 &
+    ./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6380 &
+    sleep 1s
+    # Register the shard location with the primary shard.
+    ./src/common/thirdparty/redis/src/redis-cli set NumRedisShards 1
+    ./src/common/thirdparty/redis/src/redis-cli rpush RedisShards 127.0.0.1:6380
+
   valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all --leak-check-heuristics=stdstring --error-exitcode=1 ./src/common/db_tests
   valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all --leak-check-heuristics=stdstring --error-exitcode=1 ./src/common/io_tests
   valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all --leak-check-heuristics=stdstring --error-exitcode=1 ./src/common/task_tests
   valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all --leak-check-heuristics=stdstring --error-exitcode=1 ./src/common/redis_tests
   valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all --leak-check-heuristics=stdstring --error-exitcode=1 ./src/common/task_table_tests
   valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all --leak-check-heuristics=stdstring --error-exitcode=1 ./src/common/object_table_tests
+  ./src/common/thirdparty/redis/src/redis-cli shutdown
+  ./src/common/thirdparty/redis/src/redis-cli -p 6380 shutdown
 fi
-
-./src/common/thirdparty/redis/src/redis-cli shutdown
-./src/common/thirdparty/redis/src/redis-cli -p 6380 shutdown

src/local_scheduler/test/run_tests.sh

@@ -5,9 +5,26 @@
 # Cause the script to exit if a single command fails.
 set -e
 
+LaunchRedis() {
+    port=$1
+    if [[ "${RAY_USE_NEW_GCS}" = "on" ]]; then
+        ./src/credis/redis/src/redis-server \
+            --loglevel warning \
+            --loadmodule ./src/credis/build/src/libmember.so \
+            --loadmodule ./src/common/redis_module/libray_redis_module.so \
+            --port $port &
+    else
+        ./src/common/thirdparty/redis/src/redis-server \
+            --loglevel warning \
+            --loadmodule ./src/common/redis_module/libray_redis_module.so \
+            --port $port &
+    fi
+}
+
+
 # Start the Redis shards.
-./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6379 &
-./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6380 &
+LaunchRedis 6379
+LaunchRedis 6380
 sleep 1s
 # Register the shard location with the primary shard.
 ./src/common/thirdparty/redis/src/redis-cli set NumRedisShards 1

src/local_scheduler/test/run_valgrind.sh

@@ -7,10 +7,28 @@ set -x
 # Cause the script to exit if a single command fails.
 set -e
 
+LaunchRedis() {
+    port=$1
+    if [[ "${RAY_USE_NEW_GCS}" = "on" ]]; then
+        ./src/credis/redis/src/redis-server \
+            --loglevel warning \
+            --loadmodule ./src/credis/build/src/libmember.so \
+            --loadmodule ./src/common/redis_module/libray_redis_module.so \
+            --port $port &
+    else
+        ./src/common/thirdparty/redis/src/redis-server \
+            --loglevel warning \
+            --loadmodule ./src/common/redis_module/libray_redis_module.so \
+            --port $port &
+    fi
+}
+
+
 # Start the Redis shards.
-./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6379 &
-./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6380 &
+LaunchRedis 6379
+LaunchRedis 6380
 sleep 1s
+
 # Register the shard location with the primary shard.
 ./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/test/run_tests.sh

@@ -8,12 +8,28 @@ sleep 1
 ./src/plasma/manager_tests
 killall plasma_store
 
+LaunchRedis() {
+    port=$1
+    if [[ "${RAY_USE_NEW_GCS}" = "on" ]]; then
+        ./src/credis/redis/src/redis-server \
+            --loglevel warning \
+            --loadmodule ./src/credis/build/src/libmember.so \
+            --loadmodule ./src/common/redis_module/libray_redis_module.so \
+            --port $port &
+    else
+        ./src/common/thirdparty/redis/src/redis-server \
+            --loglevel warning \
+            --loadmodule ./src/common/redis_module/libray_redis_module.so \
+            --port $port &
+    fi
+}
+
 # Start the Redis shards.
-./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6379 &
+LaunchRedis 6379
 redis_pid1=$!
-./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6380 &
+LaunchRedis 6380
 redis_pid2=$!
-sleep 1
+sleep 1s
 
 # Flush the redis server
 ./src/common/thirdparty/redis/src/redis-cli flushall

src/ray/test/run_object_manager_valgrind.sh

@@ -26,15 +26,25 @@ REDIS_MODULE="$CORE_DIR/src/common/redis_module/libray_redis_module.so"
 STORE_EXEC="$CORE_DIR/src/plasma/plasma_store"
 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
+    REDIS_SERVER="$CORE_DIR/src/credis/redis/src/redis-server"
+
+    CREDIS_MODULE="$CORE_DIR/src/credis/build/src/libmember.so"
+    LOAD_MODULE_ARGS="--loadmodule ${CREDIS_MODULE} --loadmodule ${REDIS_MODULE}"
+else
+    REDIS_SERVER="${REDIS_DIR}/redis-server"
+    LOAD_MODULE_ARGS="--loadmodule ${REDIS_MODULE}"
+fi
+
 echo "$STORE_EXEC"
-echo "$REDIS_DIR/redis-server --loglevel warning --loadmodule $REDIS_MODULE --port 6379"
+echo "${REDIS_SERVER} --loglevel warning ${LOAD_MODULE_ARGS} --port 6379"
 echo "$REDIS_DIR/redis-cli -p 6379 shutdown"
 
 # Allow cleanup commands to fail.
 killall plasma_store || true
 $REDIS_DIR/redis-cli -p 6379 shutdown || true
 sleep 1s
-$REDIS_DIR/redis-server --loglevel warning --loadmodule $REDIS_MODULE --port 6379 &
+${REDIS_SERVER} --loglevel warning ${LOAD_MODULE_ARGS} --port 6379 &
 sleep 1s
 
 # Run tests.

src/ray/test/start_raylets.sh

@@ -5,8 +5,24 @@
 # Cause the script to exit if a single command fails.
 set -e
 
+LaunchRedis() {
+    port=$1
+    if [[ "${RAY_USE_NEW_GCS}" = "on" ]]; then
+        ./src/credis/redis/src/redis-server \
+            --loglevel warning \
+            --loadmodule ./src/credis/build/src/libmember.so \
+            --loadmodule ./src/common/redis_module/libray_redis_module.so \
+            --port $port >/dev/null &
+    else
+        ./src/common/thirdparty/redis/src/redis-server \
+            --loglevel warning \
+            --loadmodule ./src/common/redis_module/libray_redis_module.so \
+            --port $port >/dev/null &
+    fi
+}
+
 # Start the GCS.
-./src/common/thirdparty/redis/src/redis-server --loglevel warning --loadmodule ./src/common/redis_module/libray_redis_module.so --port 6379 >/dev/null &
+LaunchRedis 6379
 sleep 1s
 
 if [[ $1 ]]; then

thirdparty/scripts/build_credis.sh

@@ -19,48 +19,46 @@ TP_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)/../
 ROOT_DIR=$TP_DIR/..
 
 if [[ "${RAY_USE_NEW_GCS}" = "on" ]]; then
-  if [ ! -d $TP_DIR/pkg/credis ]; then
-    pushd "$TP_DIR/pkg/"
-      rm -rf credis
-      git clone --recursive https://github.com/ray-project/credis
-    popd
-
-    pushd "$TP_DIR/pkg/credis"
-      # git checkout 6be4a739ab5e795c98402b27c2e254f86e3524ea
+  pushd "$TP_DIR/pkg/"
+    rm -rf credis
+    git clone --recursive https://github.com/ray-project/credis
+  popd
 
-      # 4/10/2018 credis/integrate branch.  With updated redis hacks.
-      git checkout cbe8ade35d2278b1d94684fa5d00010cb015ef82
+  pushd "$TP_DIR/pkg/credis"
+    # git checkout 6be4a739ab5e795c98402b27c2e254f86e3524ea
 
-      # If the above commit points to different submodules' commits than
-      # origin's head, this updates the submodules.
-      git submodule update
+    # 4/10/2018 credis/integrate branch.  With updated redis hacks.
+    git checkout cbe8ade35d2278b1d94684fa5d00010cb015ef82
 
-      # TODO(pcm): Get the build environment for tcmalloc set up and compile redis
-      # with tcmalloc.
-      # NOTE(zongheng): if we don't specify MALLOC=jemalloc, then build behiavors
-      # differ between Mac (libc) and Linux (jemalloc)... This breaks our CMake
-      # rules.
-      if [[ "${CREDIS_TCMALLOC}" = 1 ]]; then
-          echo "CREDIS_MALLOC is set, using tcmalloc to build redis"
-          pushd redis && env USE_TCMALLOC=yes make -j && popd
-      else
-          pushd redis && make -j MALLOC=jemalloc && popd
-      fi
-      pushd glog && cmake -DWITH_GFLAGS=off . && make -j && popd
-      # NOTE(zongheng): DO NOT USE -j parallel build for leveldb as it's incorrect!
-      pushd leveldb && CXXFLAGS="$CXXFLAGS -fPIC" make && popd
+    # If the above commit points to different submodules' commits than
+    # origin's head, this updates the submodules.
+    git submodule update
 
-      mkdir build
-      pushd build
-        cmake ..
-        make -j
-      popd
+    # TODO(pcm): Get the build environment for tcmalloc set up and compile redis
+    # with tcmalloc.
+    # NOTE(zongheng): if we don't specify MALLOC=jemalloc, then build behiavors
+    # differ between Mac (libc) and Linux (jemalloc)... This breaks our CMake
+    # rules.
+    if [[ "${CREDIS_TCMALLOC}" = 1 ]]; then
+        echo "CREDIS_MALLOC is set, using tcmalloc to build redis"
+        pushd redis && env USE_TCMALLOC=yes make -j && popd
+    else
+        pushd redis && make -j MALLOC=jemalloc && popd
+    fi
+    pushd glog && cmake -DWITH_GFLAGS=off . && make -j && popd
+    # NOTE(zongheng): DO NOT USE -j parallel build for leveldb as it's incorrect!
+    pushd leveldb && CXXFLAGS="$CXXFLAGS -fPIC" make && popd
 
-      mkdir -p $ROOT_DIR/python/ray/core/src/credis/redis/src/
-      cp redis/src/redis-server $ROOT_DIR/python/ray/core/src/credis/redis/src/redis-server
-      mkdir -p $ROOT_DIR/python/ray/core/src/credis/build/src/
-      cp build/src/libmaster.so $ROOT_DIR/python/ray/core/src/credis/build/src/libmaster.so
-      cp build/src/libmember.so $ROOT_DIR/python/ray/core/src/credis/build/src/libmember.so
+    mkdir build
+    pushd build
+      cmake ..
+      make -j
     popd
-  fi
+
+    mkdir -p $ROOT_DIR/python/ray/core/src/credis/redis/src/
+    cp redis/src/redis-server $ROOT_DIR/python/ray/core/src/credis/redis/src/redis-server
+    mkdir -p $ROOT_DIR/python/ray/core/src/credis/build/src/
+    cp build/src/libmaster.so $ROOT_DIR/python/ray/core/src/credis/build/src/libmaster.so
+    cp build/src/libmember.so $ROOT_DIR/python/ray/core/src/credis/build/src/libmember.so
+  popd
 fi