Skip to content

Reset timeout on missing settings when queue non-empty #9

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

Draft
sderrow wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Reset timeout on missing settings when queue non-empty #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/cluster/RedisDatastore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class RedisDatastore {
.then(() => {
if (!this._disconnecting) {
this.heartbeat = setInterval(() => {
return this.runScript("heartbeat", []).catch((e) => {
return this.runScript("heartbeat", [this.instance.queued()]).catch((e) => {
if (!this._disconnecting) {
this.instance.Events.trigger("error", e);
}
Expand Down Expand Up @@ -135,7 +135,12 @@ class RedisDatastore {
e.message.match(/^(.*\s)?SETTINGS_KEY_NOT_FOUND$/) !== null
) {
if (name === "heartbeat") {
return undefined;
if (this.instance.queued() > 0) {
await this.runScript("init", this.prepareInitSettings(false));
await this.runScript("register_client", [this.instance.queued()]);
await this.instance._drainAll();
}
return;
}
await this.runScript("init", this.prepareInitSettings(false));
return this.runScript(name, args);
Expand Down
2 changes: 1 addition & 1 deletion src/cluster/Scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const templates = {
heartbeat: {
keys: exports.allKeys,
headers: ["validate_keys", "validate_client", "process_tick"],
refresh_expiration: false,
refresh_expiration: true,
code: lua["heartbeat.lua"],
},
update_settings: {
Expand Down
7 changes: 7 additions & 0 deletions src/cluster/lua/heartbeat.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
local queued = tonumber(ARGV[num_static_argv + 1])

local groupTimeout = tonumber(redis.call('hget', settings_key, 'groupTimeout'))
if groupTimeout ~= nil and queued > 0 then
refresh_expiration(now, now, groupTimeout)
end

process_tick(now, true)