-
-
Notifications
You must be signed in to change notification settings - Fork 218
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.
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
Process Repeaters, Part 1 #35033
base: master
Are you sure you want to change the base?
Process Repeaters, Part 1 #35033
Conversation
e06a034
to
e83e925
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indexes on boolean fields typically don't get used but a useful approach can be to use a partial index to match the query you are trying to optimize. In this case I think it it may work to create a partial index on next_attempt_at
with a condition for is_paused=False
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Like so? d8d9642
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. Still worth testing that to make sure the query uses it.
e83e925
to
db093d0
Compare
db093d0
to
48c3d7c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
First pass, didn't dig into tests much.
for domain, repeater_id, lock_token in iter_ready_repeater_ids_forever(): | ||
process_repeater.delay(domain, repeater_id, lock_token) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to be checking how long this task has been running for and exit if we are about to exceed the process_repeater_lock
timeout value? I assume it is very unlikely that there are always repeaters that we can iterate over since once we kick them off, they will no longer be returned in this query, but is it safe to still have a check of some sort?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to be checking how long this task has been running for and exit if we are about to exceed the
process_repeater_lock
timeout value?
process_repeater()
should take a maximum of five minutes, if that repeater's requests are timing out. The lock timeout is three hours.
I expect we would only exceed the timeout if Celery was killed and the update_repeater()
task was never called. So the timeout is intended to prevent a repeater from being locked forever.
I think it could be useful to use Datadog to monitor how long the task takes, but probably only to identify problematic endpoints, not to exit the task.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I may not be understanding, but I'm referring to the process_repeaters
task and the process_repeater_lock
with the 24 hour timeout.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for my confusion. I didn't read your question properly.
I wondered about that timeout too, because there is no problem if this loop just keeps going for more than 24 hours as long as new repeat records are being sent in a reasonable time.
What do you think of not having a timeout?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# repeater can use to send repeat records at the same time. This is a | ||
# guardrail to prevent one repeater from hogging repeat_record_queue | ||
# workers and to ensure that repeaters are iterated fairly. | ||
MAX_REPEATER_WORKERS = 144 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a function of # of celery workers right? It is out of scope of this PR, but it would be pretty cool if we could figure out how many workers celery has dedicated to a specific queue and set this to some percentage of that (looks like that is 50% at the moment).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I agree. It would be excellent to be able to calculate this value.
(It is 144 here because that was the number of workers at the time of writing. It was recently doubled.)
8da8851
to
ceddbaa
Compare
ceddbaa
to
ea918f3
Compare
d35d19f
to
e3bcd74
Compare
CREATE INDEX CONCURRENTLY "next_attempt_at_partial_idx" | ||
ON "repeaters_repeater" ("next_attempt_at") | ||
WHERE (NOT "is_deleted" AND NOT "is_paused"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I analyzed the query used by Repeater.objects.get_all_ready_ids_by_domain()
, and this is the result on Staging:
> EXPLAIN ANALYZE SELECT "repeaters_repeater"."domain", "repeaters_repeater"."id_"
FROM "repeaters_repeater"
INNER JOIN "repeaters_repeatrecord"
ON ("repeaters_repeater"."id_" = "repeaters_repeatrecord"."repeater_id_")
WHERE (
NOT "repeaters_repeater"."is_deleted"
AND NOT "repeaters_repeater"."is_paused"
AND (
"repeaters_repeater"."next_attempt_at" IS NULL
OR "repeaters_repeater"."next_attempt_at" <= '2024-10-19 22:11:36.310082'
)
AND "repeaters_repeatrecord"."state" IN (1, 2)
);
QUERY PLAN
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Gather (cost=8423.11..141317.33 rows=52115 width=30) (actual time=61.472..1547.920 rows=638862 loops=1)
Workers Planned: 2
Workers Launched: 2
-> Hash Join (cost=7423.11..135105.83 rows=21715 width=30) (actual time=56.214..1224.831 rows=212954 loops=3)
Hash Cond: (repeaters_repeatrecord.repeater_id_ = repeaters_repeater.id_)
-> Parallel Bitmap Heap Scan on repeaters_repeatrecord (cost=7289.92..134244.51 rows=276830 width=16) (actual time=52.249..1077.808 rows=223024 loops=3)
Recheck Cond: (state = ANY ('{1,2}'::integer[]))
Heap Blocks: exact=16852
-> Bitmap Index Scan on repeaters_repeatrecord_state_8055083b (cost=0.00..7123.82 rows=664393 width=0) (actual time=44.255..44.256 rows=669452 loops=1)
Index Cond: (state = ANY ('{1,2}'::integer[]))
-> Hash (cost=131.11..131.11 rows=167 width=30) (actual time=0.713..0.722 rows=163 loops=3)
Buckets: 1024 Batches: 1 Memory Usage: 18kB
-> Bitmap Heap Scan on repeaters_repeater (cost=5.84..131.11 rows=167 width=30) (actual time=0.089..0.660 rows=163 loops=3)
Filter: ((NOT is_deleted) AND (NOT is_paused) AND ((next_attempt_at IS NULL) OR (next_attempt_at <= '2024-10-19 22:11:36.310082+00'::timestamp with time zone)))
Rows Removed by Filter: 40
Heap Blocks: exact=67
-> Bitmap Index Scan on repeaters_repeater_is_deleted_08441bf0 (cost=0.00..5.80 rows=203 width=0) (actual time=0.053..0.059 rows=253 loops=3)
Index Cond: (is_deleted = false)
Planning Time: 0.874 ms
Execution Time: 1623.954 ms
(20 rows)
The "next_attempt_at_partial_idx" was chosen to match the filter in that query plan, but Postgres is not using the index.
Should we drop it, change it, or leave it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How much data is present on staging? If not much then those two indexes may have had very similar outcomes and the choice of which to use may not have been very meaningful.
I'd check the same or a similar query on prod to see if you get the same query plan.
Do we need both indexes? Would it break other queries if we added the partial condition NOT "is_deleted" AND NOT "is_paused"
on repeaters_repeatrecord_state_8055083b
and eliminated the ?next_attempt_at_partial_idx
index
Edit: realized that those indexes are on separate tables, so the question above did not make sense. Crossed out some bits, but I think the question of whether to add a condition to the repeatrecord index still makes sense.
Edit 2: I guess maybe that does not make sense since is_deleted
and is_paused
are not columns on the repeatrecord
table. I think the gist of my question is whether there is a way to only index rows on that table that are active and eliminate the many millions of rows that will never be touched again?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"repeaters_repeater"."next_attempt_at" IS NULL OR "repeaters_repeater"."next_attempt_at" <= '2024-10-19 22:11:36.310082'
This condition could be an issue. The NULL and the range check can't be accomplished with a single index operation which may be why it's not using the index.
You could try split the query into two queries and doing a union of the results. It seems counter intuitive but if the indexes get used the performance will be better:
SELECT "repeaters_repeater"."domain", "repeaters_repeater"."id_"
FROM "repeaters_repeater"
INNER JOIN "repeaters_repeatrecord"
ON ("repeaters_repeater"."id_" = "repeaters_repeatrecord"."repeater_id_")
WHERE (
NOT "repeaters_repeater"."is_deleted"
AND NOT "repeaters_repeater"."is_paused"
AND "repeaters_repeater"."next_attempt_at" IS NULL
AND "repeaters_repeatrecord"."state" IN (1, 2)
)
UNION ALL
SELECT "repeaters_repeater"."domain", "repeaters_repeater"."id_"
FROM "repeaters_repeater"
INNER JOIN "repeaters_repeatrecord"
ON ("repeaters_repeater"."id_" = "repeaters_repeatrecord"."repeater_id_")
WHERE (
NOT "repeaters_repeater"."is_deleted"
AND NOT "repeaters_repeater"."is_paused"
AND "repeaters_repeater"."next_attempt_at" <= '2024-10-19 22:11:36.310082'
AND "repeaters_repeatrecord"."state" IN (1, 2)
);
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting! Thank you!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very nice. It uses the index.
QUERY PLAN
----------
Gather (cost=1078.24..298737.78 rows=91675 width=30) (actual time=1860.938..7291.760 rows=952533 loops=1)
Workers Planned: 2
Workers Launched: 2
-> Parallel Append (cost=78.24..288570.28 rows=91675 width=30) (actual time=1103.767..5783.887 rows=317511 loops=3)
-> Hash Join (cost=132.62..143624.77 rows=31897 width=30) (actual time=1.539..2456.512 rows=317502 loops=3)
Hash Cond: (repeaters_repeatrecord.repeater_id_ = repeaters_repeater.id_)
-> Parallel Seq Scan on repeaters_repeatrecord (cost=0.00..142389.57 rows=419192 width=16) (actual time=1.080..2293.795 rows=327791 loops=3)
Filter: (state = ANY ('{1,2}'::integer[]))
Rows Removed by Filter: 1776517
-> Hash (cost=130.60..130.60 rows=162 width=30) (actual time=0.357..0.359 rows=153 loops=3)
Buckets: 1024 Batches: 1 Memory Usage: 17kB
-> Bitmap Heap Scan on repeaters_repeater (cost=5.84..130.60 rows=162 width=30) (actual time=0.067..0.295 rows=153 loops=3)
Filter: ((NOT is_deleted) AND (NOT is_paused) AND (next_attempt_at IS NULL))
Rows Removed by Filter: 50
Heap Blocks: exact=67
-> Bitmap Index Scan on repeaters_repeater_is_deleted_08441bf0 (cost=0.00..5.80 rows=203 width=0) (actual time=0.044..0.045 rows=253 loops=3)
Index Cond: (is_deleted = false)
-> Hash Join (cost=78.24..143570.39 rows=6301 width=30) (actual time=1655.248..4904.097 rows=14 loops=2)
Hash Cond: (repeaters_repeatrecord_1.repeater_id_ = repeaters_repeater_1.id_)
-> Parallel Seq Scan on repeaters_repeatrecord repeaters_repeatrecord_1 (cost=0.00..142389.57 rows=419192 width=16) (actual time=0.043..4756.595 rows=491687 loops=2)
Filter: (state = ANY ('{1,2}'::integer[]))
Rows Removed by Filter: 2664776
-> Hash (cost=77.84..77.84 rows=32 width=30) (actual time=39.663..39.664 rows=10 loops=2)
Buckets: 1024 Batches: 1 Memory Usage: 9kB
-> Bitmap Heap Scan on repeaters_repeater repeaters_repeater_1 (cost=4.39..77.84 rows=32 width=30) (actual time=39.626..39.647 rows=10 loops=2)
Recheck Cond: ((next_attempt_at <= '2024-10-19 22:11:36.310082+00'::timestamp with time zone) AND (NOT is_deleted) AND (NOT is_paused))
Heap Blocks: exact=7
-> Bitmap Index Scan on next_attempt_at_partial_idx (cost=0.00..4.38 rows=32 width=0) (actual time=39.577..39.577 rows=10 loops=2)
Index Cond: (next_attempt_at <= '2024-10-19 22:11:36.310082+00'::timestamp with time zone)
Planning Time: 3.019 ms
Execution Time: 7411.459 ms
(31 rows)
Out of curiosity, I'll try a composite index and see what difference it makes. Either way, this feels like a big step in the right direction.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With a composite index, planning time is 2.5 ms faster, but execution time is 363 ms slower. The partial index wins.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found some changes that made a significant difference. efc4dde
The details are in the commit message:
After some analyzing, it turns out that the query is between two and three times as fast using a partial index on
RepeatRecord.repeater_id
wherestate
is Pending or Failed. Performance is also improved using a partial index withRepeater.is_deleted
instead of a normal B-tree index. When these two indexes are used, thenext_attempt_at_partial_idx
is not used.
I've dropped the next_attempt_at_partial_idx
because of that, and changed the indexes for Repeater.state
and Repeater.is_deleted
to be partial.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think Parallel Seq Scan on repeaters_repeatrecord
is going to be a problem if that query plan is chosen on prod. In comparison, Index Scan on repeaters_repeater_...
is inconsequential because there are only ~2000 (tiny number) repeaters whereas there are millions of repeat records.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to close the loop here: I tested the RepeatRecord.state index on Prod, and Postgres uses it for both subqueries. I tested on Friday afternoon, and the query took around 27 seconds.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the benefits of this PR are big enough for us to iterate on step-wise improvements after it is merged. One improvement I think we should consider is replacing the repeaters_repeatrecord
table with nested partitioning / subpartitioning. Something like:
CREATE TABLE repeaters_repeatrecord_p (
-- ...
) PARTITION BY LIST (state);
CREATE TABLE repeaters_repeatrecord_ready
PARTITION OF repeaters_repeatrecord_p
FOR VALUES IN (1, 2);
CREATE TABLE repeaters_repeatrecord_done
PARTITION OF repeaters_repeatrecord_p
FOR VALUES IN NOT (1, 2)
PARTITION BY RANGE (registered_on);
CREATE TABLE repeaters_repeatrecord_2010
PARTITION OF repeaters_repeatrecord_done
FOR VALUES FROM ('2010-01-01') TO ('2011-01-01');
-- etc.
This will improve queries on repeat records ready to be sent, and also allow us to drop completed repeat records after some expiry (TBD).
After some analyzing, it turns out that the query is between two and three times as fast using a partial index on RepeatRecord.repeater_id where state is pending or failed. Performance is also improved using a partial index with Repeater.is_deleted instead of a normal B-tree index. When these two indexes are used, the next_attempt_at_partial_idx is not used.
4bfb485
to
102d814
Compare
102d814
to
74137f9
Compare
migrations.AddIndex( | ||
model_name="repeatrecord", | ||
index=models.Index( | ||
condition=models.Q(("state__in", (1, 2))), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder what are the computational differences in Postgres for state IN (1, 2)
vs state = 1 OR state = 2
? I hope they are virtually the same, but it would be a shame if IN (...)
does something complicated with a loop.
), | ||
), | ||
], | ||
|
||
database_operations=[ | ||
# Drop `Repeater.id_deleted` index |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
# Drop `Repeater.id_deleted` index | |
# Drop `Repeater.is_deleted` index |
registered_at=five_minutes_ago, | ||
) | ||
wait_duration = _get_wait_duration_seconds(repeat_record) | ||
self.assertEqual(wait_duration, 300) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could there be a race condition (resulting in a flaky test) if something took an extra second or two (like garbage collection) between when repeat_record
is created and when _get_wait_duration_seconds
is run? Seems unlikely, but not impossible. Maybe consider using something like freezegun.freeze_time
?
The same applies to other tests in this class as well.
round-robin fashion, cycling through the domains. It does this so that: | ||
|
||
* Domains and repeaters are not rate-limited unnecessarily. | ||
* Remote APIs are not unintentionally DDoS-attacked by CommCare HQ. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Technically this would be a "DoS", not a "DDoS".
set per repeater) and spawns tasks to send them in parallel. The results | ||
of all the send attempts are passed to ``update_repeater()``. If all the | ||
send attempts failed, the **repeater** (not the repeat record) is backed | ||
off. If any send attempts succeeded, the backoff is reset. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Imagine a scenario where the first attempt usually succeeds, but subsequent attempts usually fail. I think we would ideally want to reduce the batch size for such a fragile repeater endpoint, but I assume we have no automated way of doing that right now. Do we have any way of detecting that scenario?
Technical Summary
At the moment, repeat records are processed independently, and this prevents us from making better decisions about the APIs that we are sending data to. e.g. If a remote server is offline, we will keep trying to send new payloads to it even if all the previous payloads failed.
The approach taken in this PR intends to process repeaters smarter, and also to share repeat record queue workers more fairly across domains. It honors rate limiting by skipping repeaters or domains when they are rate-limited.
Context:
check_repeaters()
task iterates repeaters #34946This branch implements the feedback given in the draft PR #34946 with commits squashed and rebased. 🐟 🐠 🐬
Almost all new functionality is behind a feature flag. The one change that is not is that up to once a minute (less often if there are repeaters being processed) we loop through the results of
RepeaterManager.all_ready()
. (That happens here.)Enabling the "process_repeaters" feature flag will switch a domain from the current approach to the new approach. The domain can be switched back to the current approach without consequences.
There are two migrations in this PR. I have kept them separate to make it easier to modify the second one. I am looking for confirmation that the indexes in Index fields used by
RepeaterManager.all_ready()
are correct.Currently there are no new Datadog metrics in this PR. I expect that as we test this more / switch domains over, we will add metrics in this PR and follow-up PRs.
Feature Flag
process_repeaters
Safety Assurance
Safety story
Automated test coverage
Includes coverage. Please highlight any gaps.
QA Plan
QA requested. Ticket pending.
Migrations
Rollback instructions
Labels & Review