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

rec: Backport RPZ retry patches #6336

Merged
merged 3 commits into from Mar 20, 2018

Conversation

Projects
None yet
3 participants
@pieterlexis
Member

pieterlexis commented Mar 12, 2018

Short description

This is a backports #6237 and the follow-up patch #6293.

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled and 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

aerique and others added some commits Jan 26, 2018

Fix failure to start RPZIXFRTracker tracker thread.
This is an initial commit and needs more work (but it's 17:07 on a
Friday, so yeah...).

(cherry picked from commit e9112b4)
Move loading of RPZ zone to RPZIXFRTracker.
(cherry picked from commit bb8ffe2)
rec: Ensure we don't hammer the RPZ master server
Before, if the `refresh` was not set in the lua-config file's
`rpzMaster` statement, we would keep trying to get delta's the whole
time. This commit ensures we update the zone's refresh config to the
value from the AXFR'd zone (if not set in the config).

(cherry picked from commit 2c68abe)

@pieterlexis pieterlexis requested a review from rgacogne Mar 12, 2018

@rgacogne rgacogne merged commit 47f1e99 into PowerDNS:rel/rec-4.1.x Mar 20, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@pieterlexis pieterlexis deleted the pieterlexis:rec-41-backport-rpz-retry branch Mar 20, 2018

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