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

avoid concurrent records/comments iteration from running out of sync #6780

Merged
merged 1 commit into from Jul 12, 2018

Conversation

Projects
None yet
3 participants
@Habbie
Member

Habbie commented Jul 9, 2018

Short description

While listing a zone via the API, if there are RRsets (i.e. a qname+qtype) with zero records and non-zero comments, merging the two datasets would derail, resulting in comments and records for subsequent RRsets being split into two JSON dicts instead of one.

  • add test The 'offending situation' (of having orphaned comments) cannot be caused via the API, so this is too much work to test. Meanwhile the existing tests do confirm that this change does not break the merging in situations with correct data.

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled this code
  • tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)
  • checked that this code was merged to master

@Habbie Habbie added this to the auth-4.1.x milestone Jul 9, 2018

@zeha

zeha approved these changes Jul 10, 2018

@pieterlexis pieterlexis merged commit d8aff75 into PowerDNS:master Jul 12, 2018

4 checks passed

LGTM analysis: C/C++ No alert changes
Details
LGTM analysis: JavaScript No alert changes
Details
LGTM analysis: Python No alert changes
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Habbie Habbie deleted the Habbie:api-fillzone-merge branch Jul 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment