diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl index f9963125e..02bda17cc 100644 --- a/bazel/ray_deps_setup.bzl +++ b/bazel/ray_deps_setup.bzl @@ -76,11 +76,12 @@ def auto_http_archive(*, name=None, url=None, urls=True, strip_prefix=strip_prefix, **kwargs) def ray_deps_setup(): + auto_http_archive( name = "com_github_antirez_redis", build_file = "//bazel:BUILD.redis", - url = "https://github.com/antirez/redis/archive/5.0.9.tar.gz", - sha256 = "db9bf149e237126f9bb5f40fb72f33701819555d06f16e9a38b4949794214201", + url = "https://github.com/redis/redis/archive/6.0.9.tar.gz", + sha256 = "2819b6d9c56be1f25cd157b9cb6b7c2733edcb46f4f6bcb1b79cefe639a2853b", patches = [ "//thirdparty/patches:redis-quiet.patch", ], @@ -107,8 +108,8 @@ def ray_deps_setup(): name = "com_github_tporadowski_redis_bin", build_file = "//bazel:BUILD.redis", strip_prefix = None, - url = "https://github.com/tporadowski/redis/releases/download/v4.0.14.2/Redis-x64-4.0.14.2.zip", - sha256 = "6fac443543244c803311de5883b714a7ae3c4fa0594cad51d75b24c4ef45b353", + url = "https://github.com/tporadowski/redis/releases/download/v5.0.9/Redis-x64-5.0.9.zip", + sha256 = "b09565b22b50c505a5faa86a7e40b6683afb22f3c17c5e6a5e35fc9b7c03f4c2", ) auto_http_archive( diff --git a/doc/requirements-rtd.txt b/doc/requirements-rtd.txt index 2afa6722c..aeef50803 100644 --- a/doc/requirements-rtd.txt +++ b/doc/requirements-rtd.txt @@ -2,7 +2,7 @@ Pygments==2.3.1 setuptools==41.0.1 docutils==0.14 mock==1.0.1 -pillow==5.4.1 +pillow==7.2.0 alabaster>=0.7,<0.8,!=0.7.5 commonmark==0.8.1 recommonmark==0.5.0 diff --git a/java/runtime/src/main/java/io/ray/runtime/runner/RunManager.java b/java/runtime/src/main/java/io/ray/runtime/runner/RunManager.java index e2101a332..5823fccf5 100644 --- a/java/runtime/src/main/java/io/ray/runtime/runner/RunManager.java +++ b/java/runtime/src/main/java/io/ray/runtime/runner/RunManager.java @@ -257,6 +257,10 @@ public class RunManager { final File redisServerFile = BinaryFileUtil.getNativeFile( rayConfig.sessionDir, BinaryFileUtil.REDIS_SERVER_BINARY_NAME); Preconditions.checkState(redisServerFile.setExecutable(true)); + // The redis module file. + File redisModule = BinaryFileUtil.getNativeFile( + rayConfig.sessionDir, BinaryFileUtil.REDIS_MODULE_LIBRARY_NAME); + Preconditions.checkState(redisModule.setExecutable(true)); List command = Lists.newArrayList( // The redis-server executable file. redisServerFile.getAbsolutePath(), @@ -268,8 +272,7 @@ public class RunManager { "warning", "--loadmodule", // The redis module file. - BinaryFileUtil.getNativeFile( - rayConfig.sessionDir, BinaryFileUtil.REDIS_MODULE_LIBRARY_NAME).getAbsolutePath() + redisModule.getAbsolutePath() ); if (!Strings.isNullOrEmpty(password)) { diff --git a/thirdparty/patches/redis-quiet.patch b/thirdparty/patches/redis-quiet.patch index 51f696ab4..c7dc4ed32 100644 --- a/thirdparty/patches/redis-quiet.patch +++ b/thirdparty/patches/redis-quiet.patch @@ -13,29 +13,53 @@ diff --git deps/jemalloc/Makefile.in deps/jemalloc/Makefile.in diff --git deps/Makefile deps/Makefile --- deps/Makefile +++ deps/Makefile -@@ -45 +45 @@ +@@ -46,13 +46,13 @@ ifeq ($(BUILD_TLS),yes) + endif + + hiredis: .make-prerequisites - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) -+# @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) -@@ -51 +51 @@ ++ #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) + cd hiredis && $(MAKE) static $(HIREDIS_MAKE_FLAGS) + + .PHONY: hiredis + + linenoise: .make-prerequisites - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) -+# @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) -@@ -61 +61 @@ ++ #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) + cd linenoise && $(MAKE) + + .PHONY: linenoise +@@ -62,7 +62,7 @@ ifeq ($(uname_S),SunOS) + LUA_CFLAGS= -D__C99FEATURES__=1 + endif + -LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) +LUA_CFLAGS+= -O2 -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) -@@ -67 +67 @@ --ARFLAGS=rcu -+ARFLAGS=rc -@@ -70 +70 @@ + LUA_LDFLAGS+= $(LDFLAGS) + # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more + # challenging to cross-compile lua (and redis). These defines make it easier +@@ -71,17 +71,17 @@ AR=ar + ARFLAGS=rcu + + lua: .make-prerequisites - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) -+# @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) -@@ -75 +75 @@ ++ #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) + cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)" + + .PHONY: lua + -JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS) +JEMALLOC_CFLAGS= -std=gnu99 -pipe -g3 -O3 -funroll-loops $(CFLAGS) -@@ -79,2 +79,2 @@ + JEMALLOC_LDFLAGS= $(LDFLAGS) + + jemalloc: .make-prerequisites - @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) -+# @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) - cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" ++ #@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) + cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --silent CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" + cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a + + .PHONY: jemalloc diff --git src/Makefile src/Makefile --- src/Makefile +++ src/Makefile