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

Jump to bottom

bugfix: when set config result_expires = 0, chord.get will hang. #6373

Merged
merged 3 commits into from Sep 30, 2020
Merged

bugfix: when set config result_expires = 0, chord.get will hang. #6373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d0600e
bugfix: when set config result_expires = 0, chord.get will hang.
laixintao Sep 29, 2020
8699e65
Merge branch 'master' into bugfix/chord-expire
laixintao Sep 30, 2020
f32e536
test: add testcase for expire when set config with zero.
laixintao Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion celery/backends/redis.py
View file
Open in desktop
Expand Up @@ -436,7 +436,7 @@ def on_chord_part_return(self, request, state, result,
if self._chord_zset
else pipe.rpush(jkey, encoded).llen(jkey)
).get(tkey)
if self.expires is not None:
if self.expires:
pipeline = pipeline \
.expire(jkey, self.expires) \
.expire(tkey, self.expires)
Expand Down
18 changes: 18 additions & 0 deletions t/unit/backends/test_redis.py
View file
Open in desktop
Expand Up @@ -712,6 +712,24 @@ def test_on_chord_part_return_no_expiry(self, restore):

self.b.expires = old_expires

@patch('celery.result.GroupResult.restore')
def test_on_chord_part_return_expire_set_to_zero(self, restore):
old_expires = self.b.expires
self.b.expires = 0
tasks = [self.create_task(i) for i in range(10)]

for i in range(10):
self.b.on_chord_part_return(tasks[i].request, states.SUCCESS, i)
assert self.b.client.zadd.call_count
self.b.client.zadd.reset_mock()
assert self.b.client.zrangebyscore.call_count
jkey = self.b.get_key_for_group('group_id', '.j')
tkey = self.b.get_key_for_group('group_id', '.t')
self.b.client.delete.assert_has_calls([call(jkey), call(tkey)])
self.b.client.expire.assert_not_called()

self.b.expires = old_expires

@patch('celery.result.GroupResult.restore')
def test_on_chord_part_return_no_expiry__unordered(self, restore):
self.app.conf.result_backend_transport_options = dict(
Expand Down