Skip to content

Enable TCP keep alive for redox #717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simon-mo merged 2 commits into from
Jun 4, 2019
Merged

Enable TCP keep alive for redox #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bab622
Enable TCP keep alive for redox
taohammer Jun 3, 2019
1d437df
Merge branch 'develop' into develop
simon-mo Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dockerfiles/ClipperPy35TestsDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ COPY ./ /clipper

# Patch Clipper
RUN cd /clipper/src/libs/spdlog \
&& git apply ../patches/make_spdlog_compile_linux.patch
&& git apply ../patches/make_spdlog_compile_linux.patch \
&& cd /clipper/src/libs/redox \
&& git apply ../patches/redis_keepalive.patch

# Set version as git hash
RUN cd /clipper && echo ${CODE_VERSION} > VERSION
Expand Down
2 changes: 2 additions & 0 deletions dockerfiles/ClipperTestsDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ RUN pip install -q -e /clipper/clipper_admin

RUN cd /clipper/src/libs/spdlog \
&& git apply ../patches/make_spdlog_compile_linux.patch \
&& cd /clipper/src/libs/redox \
&& git apply ../patches/redis_keepalive.patch \
&& cd /clipper \
&& ./configure \
&& cd debug \
Expand Down
2 changes: 2 additions & 0 deletions dockerfiles/ManagementFrontendDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ COPY ./ /clipper

RUN cd /clipper/src/libs/spdlog \
&& git apply ../patches/make_spdlog_compile_linux.patch \
&& cd /clipper/src/libs/redox \
&& git apply ../patches/redis_keepalive.patch \
&& cd /clipper \
&& ./configure --cleanup-quiet \
&& ./configure --release \
Expand Down
4 changes: 3 additions & 1 deletion dockerfiles/QueryFrontendDockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ COPY ./ /clipper

RUN cd /clipper/src/libs/spdlog \
&& git apply ../patches/make_spdlog_compile_linux.patch \
&& cd /clipper/src/libs/redox \
&& git apply ../patches/redis_keepalive.patch \
&& cd /clipper \
&& ./configure --cleanup-quiet \
&& ./configure --release \
Expand All @@ -20,4 +22,4 @@ WORKDIR /clipper/

ENTRYPOINT ["/clipper/query_frontend_entry.sh"]

# vim: set filetype=dockerfile:
# vim: set filetype=dockerfile:
11 changes: 11 additions & 0 deletions src/libs/patches/redis_keepalive.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff -urN redox.org/src/client.cpp redox/src/client.cpp
--- redox.org/src/client.cpp 2019-05-31 18:58:11.104997558 +0900
+++ redox/src/client.cpp 2019-05-31 20:34:21.826154449 +0900
@@ -57,6 +57,7 @@

// Connect over TCP
ctx_ = redisAsyncConnect(host.c_str(), port);
+ redisEnableKeepAlive(&(ctx_->c));

if (!initHiredis())
return false;