Skip to content

Commit a20e792

Browse files
arpanshah29ask
authored andcommitted
Changing eta documentation (celery#4264)
1 parent fd427f2 commit a20e792

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

docs/internals/worker.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ When a message is received it's converted into a
3838
Tasks with an ETA, or rate-limit are entered into the `timer`,
3939
messages that can be immediately processed are sent to the execution pool.
4040

41-
ETA and rate-limit are 2 incompatible parameters, and the ETA is overriding
42-
the rate-limit by default. A task with both will follow its ETA and ignore its
43-
rate-limit.
41+
ETA and rate-limit when used together will result in the rate limit being
42+
observed with the task being scheduled after the ETA.
4443

4544
Timer
4645
-----

docs/userguide/tasks.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -918,10 +918,6 @@ General
918918
maximum number of requests per second), you must restrict to a given
919919
queue.
920920

921-
.. note::
922-
923-
This attribute is ignored if the task is requested with an ETA.
924-
925921
.. attribute:: Task.time_limit
926922

927923
The hard time limit, in seconds, for this task.

0 commit comments

Comments
 (0)