Add new query retried status #901
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…. If a query was retried five times before it suceeded, queries 1-4 will be marked as RETRIED and only query 5 will stay in status FORWARDED. Signed-off-by: DL6ER <dl6er@dl6er.de>
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: |
…me of when we already have the upstream response but DNSSEC validation is still ongoing Signed-off-by: DL6ER <dl6er@dl6er.de>
|
The failed The failed CodeFactor issue is something I will address separately, however, the mentioned possibly security-relevant race condition doesn't apply to our code at all. It is only meant for ensuring that the ownership is correct when FTL is started as This PR can go in as-is. The two 🔴 can be ignored. |
…ed normal queries take over, we have to flat the original query. Signed-off-by: DL6ER <dl6er@dl6er.de>
dschaper
approved these changes
Oct 22, 2020
dschaper
added
PR: Approved
8 tasks
|
Pada tanggal Kam, 8 Okt 2020 22.08, DL6ER <notifications@github.com>
menulis:
… *By submitting this pull request, I confirm the following:*
- I have read and understood the contributors guide
<https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md>.
- I have checked that another pull request
<https://github.com/pi-hole/FTL/pulls> for this purpose does not exist.
- I have considered, and confirmed that this submission will be
valuable to others.
- I accept that this submission may not be used, and the pull request
closed at the will of the maintainer.
- I give this submission freely, and claim no ownership to its content.
*How familiar are you with the codebase?:*
10
------------------------------
Add new status RETRIED (12) to be used for queries which were retried. If
a query was retried five times until we received a reply form upstream,
queries 1-4 will be marked as RETRIED and only query 5 will stay in
status FORWARDED. This does not affect the statistics because all five
queries where send upstream, so five upstream packages are counted, even
when only one query stays in status FORWARDED.
The web interface will need updating to support this status. This will be
done in a follow-up PR.
------------------------------
You can view, comment on, or merge this pull request online at:
#901
Commit Summary
- Add new status RETRIED (12) to be used for queries which were
retried. If a query was retried five times before it suceeded, queries 1-4
will be marked as RETRIED and only query 5 will stay in status FORWARDED.
File Changes
- *M* src/dnsmasq/forward.c
<https://github.com/pi-hole/FTL/pull/901/files#diff-083f3daa68ede9a2b2ab9dadcb8df6a7>
(2)
- *M* src/dnsmasq_interface.c
<https://github.com/pi-hole/FTL/pull/901/files#diff-092b49420239862fdbdcc87fdc72e10c>
(20)
- *M* src/dnsmasq_interface.h
<https://github.com/pi-hole/FTL/pull/901/files#diff-d25b42a05117e78d6ee9b940a9a9988f>
(3)
- *M* src/enums.h
<https://github.com/pi-hole/FTL/pull/901/files#diff-66217ab5c054d1ce40c5940ec02eb541>
(1)
- *M* src/gc.c
<https://github.com/pi-hole/FTL/pull/901/files#diff-31b93f4272eaeede3738531e90317e0c>
(3)
Patch Links:
- https://github.com/pi-hole/FTL/pull/901.patch
- https://github.com/pi-hole/FTL/pull/901.diff
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#901>, or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AORSR5KWWEKMQLQQXHOTLQDSJXIYTANCNFSM4SI4H7MA>
.
|
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pi-hole-core-web-v5-2-and-ftl-v5-3-released/40909/1 |
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pihole-ftl-log-found-unknown-status-12-in-long-term-database/41048/1 |
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By submitting this pull request, I confirm the following:
How familiar are you with the codebase?:
10
Add new status
RETRIED(12) to be used for queries which were retried. If a query was retried five times until we received a reply form upstream, queries 1-4 will be marked asRETRIEDand only query 5 will stay in statusFORWARDED. This does not affect the statistics because all five queries where send upstream, so five upstream packages are counted, even when only one query stays in statusFORWARDED.edit Add another new status
RETRIED_DNSSEC(13) to be used for queries for which which automatic DNSSEC queries were retried. If we've already got an answer to a query, but we're awaiting keys for validation, there's no point retrying the query, so we're retrying the key query instead.The web interface will need updating to support this status. This will be done in a follow-up PR.