Skip to content
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

Update hiredis-cluster to 0.14.0 from 0.11.0 #48

Merged
merged 9 commits into from
Sep 21, 2024
Merged

Update hiredis-cluster to 0.14.0 from 0.11.0 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5c97c10
update hiredis-cluster to 0.14.0
plainbanana Sep 6, 2024
581a04f
nits: Update Minilla version in META.json
plainbanana Sep 6, 2024
b64063f
fix: Fix reconnect issue after forking.
plainbanana Sep 6, 2024
bdfff66
fix: dispatch event loop
plainbanana Sep 20, 2024
8e8e122
fix: error object type
plainbanana Sep 20, 2024
9a4c88d
feat: Handle event dispatch failure
plainbanana Sep 20, 2024
c1098ae
refactor: delete redundant DEBUG_MSG
plainbanana Sep 20, 2024
450c0e2
fix: process ID assignment order
plainbanana Sep 20, 2024
70c517c
fix: error message
plainbanana Sep 20, 2024
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
2 changes: 1 addition & 1 deletion META.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"plainbanana <[email protected]>"
],
"dynamic_config" : 0,
"generated_by" : "Minilla/v3.1.22, CPAN::Meta::Converter version 2.150005",
"generated_by" : "Minilla/v3.1.23, CPAN::Meta::Converter version 2.150005",
"license" : [
"perl_5"
],
Expand Down
2 changes: 1 addition & 1 deletion deps/hiredis-cluster
Open in desktop
Submodule hiredis-cluster updated 32 files
+11 −0 .github/dependabot.yml
+30 −25 .github/workflows/ci.yml
+5 −2 .github/workflows/coverity.yml
+103 −0 .github/workflows/db-compatibility.yml
+0 −57 .github/workflows/redis_compability.yml
+21 −0 CHANGELOG.md
+6 −6 CMakeLists.txt
+26 −0 README.md
+7 −4 cmddef.h
+37 −17 command.c
+5 −0 examples/src/CMakeLists.txt
+167 −0 examples/src/clientside_caching_async.c
+2 −2 examples/src/example_async.c
+1 −1 examples/using_cmake_and_make_mixed/build.sh
+1 −1 examples/using_cmake_externalproject/CMakeLists.txt
+1 −1 examples/using_cmake_separate/build.sh
+1 −1 examples/using_make/build.sh
+153 −38 gencommands.py
+114 −30 hircluster.c
+25 −2 hircluster.h
+31 −7 tests/CMakeLists.txt
+37 −4 tests/clusterclient_async.c
+2 −2 tests/clusterclient_reconnect_async.c
+18 −0 tests/ct_async.c
+4 −18 tests/ct_connection.c
+75 −0 tests/scripts/client-disconnect-test.sh
+104 −0 tests/scripts/client-disconnect-without-slotmap-update-test.sh
+67 −0 tests/scripts/slots-not-served-test-async.sh
+76 −0 tests/scripts/slots-not-served-test.sh
+40 −0 tests/scripts/valkey-cluster
+44 −0 tests/ut_parse_cmd.c
+4 −0 win32.h
11 changes: 11 additions & 0 deletions src/Fast.xs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,17 @@ void Redis__Cluster__Fast_run_cmd(pTHX_ Redis__Cluster__Fast self, int argc, con
return;
}
redisClusterAsyncDisconnect(self->acc);

if (event_base_dispatch(self->cluster_event_base) == -1) {
reply_t->error = newSVpvf("%s", "event_base_dispatch failed after forking");
return;
}

if (redisClusterConnect2(self->acc->cc) != REDIS_OK) {
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[MEMO]

I implemented (1.) as it allows for a more simple solution.

Issue event_reinit and redisClusterAsyncDisconnect, then use redisClusterConnect2 to clear the shutdown flag and reconnect.

Since there’s no significant difference, either method should work.

reply_t->error = newSVpvf("failed to re-connect: %s", self->acc->cc->errstr);
return;
}

self->pid = current_pid;
}

Expand Down
Loading