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 spurious "resource limit exceeded" messages (v5 backport) #1893

Merged
merged 3 commits into from
Feb 20, 2024

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Feb 19, 2024

What does this implement/fix?

Backports #1892 to FTL v5.25 - aiming straight for a bugfix release.


Related issue or feature (if applicable): https://discourse.pi-hole.net/t/pihole-unbound-dnsmasq-validation-failed-resource-limit-exeeded/68388

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

DL6ER and others added 3 commits February 14, 2024 20:13
Sync master back into development
Replies from upstream with a REFUSED rcode can result in
log messages stating that a resource limit has been exceeded,
which is not the case.

Thanks to Dominik Derigs and the Pi-hole project for
spotting this.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pihole-unbound-dnsmasq-validation-failed-resource-limit-exeeded/68388/27

@DL6ER DL6ER marked this pull request as ready for review February 19, 2024 20:05
@DL6ER DL6ER requested a review from a team February 19, 2024 20:06
@DL6ER
Copy link
Member Author

DL6ER commented Feb 19, 2024

Confirmed on Discourse:

I was able to reproduce the error every time and can confirm that it no longer occurs with this version.

@dschaper dschaper self-requested a review February 20, 2024 18:49
@DL6ER DL6ER merged commit 1c2257b into master Feb 20, 2024
20 checks passed
@DL6ER DL6ER deleted the release/v5.25.1 branch February 20, 2024 19:02
truecharts-admin referenced this pull request in truecharts/charts Mar 4, 2024
…56 by renovate (#18853)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [pihole/pihole](https://togithub.com/pi-hole/docker-pi-hole) | patch |
`2024.02.0` -> `2024.02.2` |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>pi-hole/docker-pi-hole (pihole/pihole)</summary>

###
[`v2024.02.2`](https://togithub.com/pi-hole/docker-pi-hole/releases/tag/2024.02.2)

[Compare
Source](https://togithub.com/pi-hole/docker-pi-hole/compare/2024.02.1...2024.02.2)

Jumped the gun a little with the last tag - didn't realise there were
changes ready to go! Should fix:
[https://github.com/pi-hole/docker-pi-hole/issues/1543](https://togithub.com/pi-hole/docker-pi-hole/issues/1543)

<!-- Release notes generated using configuration in .github/release.yml
at master -->

#### What's Changed

- Enhance theme validation by
[@&#8203;ADawidowski](https://togithub.com/ADawidowski) in
[https://github.com/pi-hole/docker-pi-hole/pull/1500](https://togithub.com/pi-hole/docker-pi-hole/pull/1500)

#### New Contributors

- [@&#8203;ADawidowski](https://togithub.com/ADawidowski) made their
first contribution in
[https://github.com/pi-hole/docker-pi-hole/pull/1500](https://togithub.com/pi-hole/docker-pi-hole/pull/1500)

**Full Changelog**:
pi-hole/docker-pi-hole@2024.02.0...2024.02.2

###
[`v2024.02.1`](https://togithub.com/pi-hole/docker-pi-hole/releases/tag/2024.02.1)

[Compare
Source](https://togithub.com/pi-hole/docker-pi-hole/compare/2024.02.0...2024.02.1)

Nothing Docker-specific this time around, tagging to include FTL v5.25.1

<!-- Release notes generated using configuration in .github/release.yml
at master -->

#### What's Changed (FTL)

- Fix spurious "resource limit exceeded" messages (v5 backport) by
[@&#8203;DL6ER](https://togithub.com/DL6ER) in
[https://github.com/pi-hole/FTL/pull/1893](https://togithub.com/pi-hole/FTL/pull/1893)

**Full Changelog**:
pi-hole/FTL@v5.25...v5.25.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 10pm on monday" in timezone
Europe/Amsterdam, Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjUuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIyNS4wIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants