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.

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

Fix incorrect default production data refresh limit of 0 #3515

Merged
merged 2 commits into from
Dec 12, 2023

Conversation

stacimc
Copy link
Collaborator

@stacimc stacimc commented Dec 12, 2023

Fixes

Description

#3232
The ingestion server allows setting a DATA_REFRESH_LIMIT used to cap the number of records processed in a data refresh. By default on production we don't have a limit. Historically we have represented this by setting the limit to 0. The copy data step has a simple if conditional before applying limits which meant that 0 was correctly considered "no limit".

When #3232 added logic to the reindexing step to also apply the record limit here, it did not have a similar check. The result is that in production, the default of 0 is applied... and 0 records are reindexed, effectively totally breaking the data refresh.

This PR:

  • Adds a check to the index worker scheduler to only apply the record limit if in fact one has been set
  • Changes the default limit in production from 0 to None, as this is more intuitive.

Testing Instructions

Locally, explicitly set DATA_REFRESH_LIMIT to None in your ingestion_server/.env to imitate production. Then run a data refresh and ensure that records make it all the way to the new es index.

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • I ran the DAG documentation generator (if applicable).

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@stacimc stacimc added 🟥 priority: critical Must be addressed ASAP 🛠 goal: fix Bug fix 💻 aspect: code Concerns the software code in the repository 🧱 stack: ingestion server Related to the ingestion/data refresh server labels Dec 12, 2023
@stacimc stacimc requested a review from a team as a code owner December 12, 2023 01:23
@stacimc stacimc changed the title Don't default data refresh record limit to 0 Fix incorrect default production data refresh limit of 0 Dec 12, 2023
Copy link
Collaborator

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Collaborator

@AetherUnbound AetherUnbound left a comment

Choose a reason for hiding this comment

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

LGTM, I looked though this logic and thought we could get tripped up here but assumed that we'd be okay since the value would end up being None - alas!

@stacimc stacimc merged commit 7131b35 into main Dec 12, 2023
69 checks passed
@stacimc stacimc deleted the fix/data-refresh-record-limit branch December 12, 2023 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💻 aspect: code Concerns the software code in the repository 🛠 goal: fix Bug fix 🟥 priority: critical Must be addressed ASAP 🧱 stack: ingestion server Related to the ingestion/data refresh server
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants