Tweak NTP error reporting #2125

DL6ER · 2024-11-30T18:09:53Z

What does this implement/fix?

This PR has three changes regarding the NTP implementation:

If there was a timeout, we log the used IP address in addition to the host name. This may be useful to determine if only specific servers cause timeouts (as suggested by @deHakkelaar)

Do not issue double warnings when receiving NTP replies fails, e.g. skip the first of these two:

2024-11-28 05:28:35.590 CET [25437/T25447] WARNING: Could not recv() in reply() (/app/src/ntp/client.c:223): Resource temporarily unavailable
2024-11-28 05:28:35.590 CET [25437/T25447] ERROR: Failed to receive data from NTP server europe.pool.ntp.org: Timeout

In case the upstream server sends a "kiss code", we interpret and show it (e.g. "access denied" when authentication is required or "rate exceeded" when querying too often). Before, we simply logged
```
Received NTP reply has invalid version, ignoring
```
in such a case.

Related issue or feature (if applicable): N/A

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

By submitting this pull request, I confirm the following:

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.
I have commented my proposed changes within the code.
I am willing to help maintain this change if there are issues with it later.
It is compatible with the EUPL 1.2 license
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.

Signed-off-by: DL6ER <[email protected]>

pralor-bot · 2024-11-30T18:10:23Z

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

https://discourse.pi-hole.net/t/no-valid-ntp-replies-received-check-server-and-network-connectivity/74237/12

pralor-bot · 2024-12-10T18:40:57Z

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

https://discourse.pi-hole.net/t/no-valid-ntp-replies-received-check-server-and-network-connectivity/74237/28

Signed-off-by: DL6ER <[email protected]>

sawsanders · 2024-12-16T00:53:38Z

Working well for me. No issues in two days of testing!

EDIT: See below, spoke too soon.

yubiuser · 2024-12-16T12:53:29Z

There is an reported crash on with this branch
https://discourse.pi-hole.net/t/pi-hole-crashed-shortly-after-upgrade/74553

DL6ER · 2024-12-16T18:13:58Z

This crash happened somewhere in the DNS resolver thread, not code that is even remotely touched by this PR. So this may be 100% coincidence.

Signed-off-by: DL6ER <[email protected]>

DL6ER · 2024-12-17T20:21:26Z

Nonetheless, I went through the resolver code line-by-line and added quite a few extra checks wherever possible. I don't think there was an issue but now everything should be even better because we are not believing in large enough buffers but actually check that before working on them.

Signed-off-by: DL6ER <[email protected]>

…ERROR message from showing up in the logs Signed-off-by: DL6ER <[email protected]>

…c was sufficiently far off (> 0.1 s) to postpone the start of the embedded NTP server Signed-off-by: DL6ER <[email protected]>

…pile-time constant) and enlarge retry interval to 10 minutes (or ntp.sync.interval if smaller) Signed-off-by: DL6ER <[email protected]>

src/ntp/client.c

Signed-off-by: Dominik <[email protected]>

sawsanders · 2024-12-22T15:55:04Z

This branch has been working very well for me. I haven't seen any issues since the last commits.

github-actions · 2025-01-11T18:42:15Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

…ntp_errors

Signed-off-by: DL6ER <[email protected]>

github-actions · 2025-01-11T20:56:25Z

Conflicts have been resolved.

yubiuser · 2025-01-11T21:23:51Z

This is nice, it restarts itself when the time was off too much on startup

2025-01-11 22:21:45.002 CET [196707/T196708] DEBUG_NTP: Successfully opened RTC at "/dev/rtc0"
2025-01-11 22:21:45.003 CET [196707/T196708] INFO: RTC time set to 2025-01-11 21:21:45
2025-01-11 22:21:45.003 CET [196707/T196708] INFO: System time was updated by 2185.4 seconds
2025-01-11 22:21:45.003 CET [196707/T196708] INFO: Restarting FTL: System time updated
2025-01-11 22:21:45.003 CET [196707/T196708] DEBUG_NTP: Local time is too inaccurate, retrying before launching NTP server
2025-01-11 22:21:45.006 CET [196707M] DEBUG_ANY: Received SIGTERM
2025-01-11 22:21:45.007 CET [196707M] INFO: Asked to terminate by "/usr/bin/pihole-FTL -f" (PID 196707, user pihole UID 999)
2025-01-11 22:21:45.008 CET [196707M] DEBUG_ANY: Sending SIGUSR6 to dnsmasq to stop DNS service
2025-01-11 22:21:45.008 CET [196707M] DEBUG_ANY: dnsmasq received signal 41

yubiuser

Should we prevent NTP server start at all if NTP sync is disabled?

2025-01-11 21:45:07.784 CET [196845M] INFO: NTP sync is disabled
2025-01-11 21:45:07.784 CET [196845/T196846] INFO: NTP server listening on 0.0.0.0:123 (IPv4)
2025-01-11 21:45:07.785 CET [196845/T196847] INFO: NTP server listening on :::123 (IPv6)

DL6ER · 2025-01-12T06:03:02Z

Seems like an artificial limitation to me. If they go and disable NTP sync, they can also disable NTP offering. Maybe they have a local GPS attached to the device (I had one once) so don't need to sync upstream but can still offer precise timing for the network.

yubiuser

I think the delay in NTP server startup can be log level info

src/dnsmasq/helper.c

src/ntp/client.c

Co-authored-by: yubiuser <[email protected]> Signed-off-by: Dominik <[email protected]>

src/ntp/client.c

Signed-off-by: yubiuser <[email protected]>

yubiuser

2025-01-12 17:55:11.992 CET [214697/T214698] INFO: Received 8/8 valid NTP replies from de.pool.ntp.org
2025-01-12 17:55:11.993 CET [214697/T214698] INFO: Time offset: 2.922946e+05 ms (excluded 0 outliers)
2025-01-12 17:55:11.993 CET [214697/T214698] INFO: Round-trip delay: 2.545059e+01 ms (excluded 0 outliers)
2025-01-12 18:00:05.000 CET [214697/T214698] INFO: Current RTC time is 2025-01-12 16:55:12
2025-01-12 18:00:05.000 CET [214697/T214698] INFO: RTC time set to 2025-01-12 17:00:05
2025-01-12 18:00:05.001 CET [214697/T214698] INFO: Local time is too inaccurate, retrying in 600 seconds before launching NTP server
2025-01-12 18:10:09.323 CET [214697/T214698] INFO: Received 8/8 valid NTP replies from de.pool.ntp.org
2025-01-12 18:10:09.324 CET [214697/T214698] INFO: Time offset: 1.023293e+00 ms (excluded 1 outliers)
2025-01-12 18:10:09.325 CET [214697/T214698] INFO: Round-trip delay: 2.449826e+01 ms (excluded 1 outliers)
2025-01-12 18:10:10.000 CET [214697/T214698] INFO: Current RTC time is 2025-01-12 17:10:10
2025-01-12 18:10:10.003 CET [214697/T214855] INFO: NTP server listening on 0.0.0.0:123 (IPv4)
2025-01-12 18:10:10.003 CET [214697/T214856] INFO: NTP server listening on :::123 (IPv6)
2025-01-12 19:10:10.329 CET [214697/T214698] INFO: Received 8/8 valid NTP replies from de.pool.ntp.org

pralor-bot · 2025-01-14T17:22:36Z

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

https://discourse.pi-hole.net/t/shm-errors-in-ftl-log-for-v6-development/75131/3

DL6ER added 3 commits November 30, 2024 18:40

Include used IP address of resolved NTP server in connection errors

2150b18

Signed-off-by: DL6ER <[email protected]>

Do not issue double warnings when receiving NTP replies fails

7efff4f

Signed-off-by: DL6ER <[email protected]>

Implement Kiss Code interpretation

7c6e315

Signed-off-by: DL6ER <[email protected]>

DL6ER added the Pi-hole v6.0 label Nov 30, 2024

DL6ER changed the title ~~Tweak/ntp errors~~ Tweak NTP error reporting Nov 30, 2024

DL6ER requested a review from a team December 6, 2024 18:40

DL6ER marked this pull request as ready for review December 6, 2024 18:40

DL6ER added 2 commits December 13, 2024 21:03

Merge branch 'development' into tweak/ntp_errors

d1624f9

Do not fork when handling NTP replies

a76e791

Signed-off-by: DL6ER <[email protected]>

Improve error checking in several functions of resolve.c

5af65fc

Signed-off-by: DL6ER <[email protected]>

DL6ER added 5 commits December 17, 2024 21:34

Minor further enhancements for NTP code

9cd1137

Signed-off-by: DL6ER <[email protected]>

Ensure NTP port can be re-bound even after fast successive restarts

cf2c7c3

Signed-off-by: DL6ER <[email protected]>

Do not try to obtain -1 ID pointer in CNAME code to prevent harmless …

747b899

…ERROR message from showing up in the logs Signed-off-by: DL6ER <[email protected]>

Dynamically reduce retry interval of NTP client in case the first syn…

c002dc2

…c was sufficiently far off (> 0.1 s) to postpone the start of the embedded NTP server Signed-off-by: DL6ER <[email protected]>

Reduce time accuracy requirements for NTP service to 0.5 seconds (com…

bc67a9f

…pile-time constant) and enlarge retry interval to 10 minutes (or ntp.sync.interval if smaller) Signed-off-by: DL6ER <[email protected]>

yubiuser reviewed Dec 21, 2024

View reviewed changes

src/ntp/client.c Outdated Show resolved Hide resolved

Update src/ntp/client.c

a673d3f

Signed-off-by: Dominik <[email protected]>

DL6ER requested a review from yubiuser December 22, 2024 08:16

github-actions bot added the Merge conflicts label Jan 11, 2025

DL6ER added 3 commits January 11, 2025 21:50

Merge branch 'development' into tweak/ntp_errors

2fe0ce7

Merge branch 'tweak/ntp_errors' of github.com:pi-hole/FTL into tweak/…

6c866eb

…ntp_errors

Merge branch 'development' into tweak/ntp_errors

268e80b

Signed-off-by: DL6ER <[email protected]>

github-actions bot removed the Merge conflicts label Jan 11, 2025

yubiuser reviewed Jan 11, 2025

View reviewed changes

yubiuser reviewed Jan 12, 2025

View reviewed changes

src/dnsmasq/helper.c Outdated Show resolved Hide resolved

src/ntp/client.c Outdated Show resolved Hide resolved

src/ntp/client.c Show resolved Hide resolved

DL6ER and others added 2 commits January 12, 2025 13:23

Update src/ntp/client.c

0f090ad

Co-authored-by: yubiuser <[email protected]> Signed-off-by: Dominik <[email protected]>

Apply suggestions from code review

c5fe649

Co-authored-by: yubiuser <[email protected]> Signed-off-by: Dominik <[email protected]>

yubiuser reviewed Jan 12, 2025

View reviewed changes

src/ntp/client.c Outdated Show resolved Hide resolved

Fix space

8a26dd9

Signed-off-by: yubiuser <[email protected]>

yubiuser approved these changes Jan 12, 2025

View reviewed changes

DL6ER merged commit bed065c into development Jan 12, 2025
19 checks passed

DL6ER deleted the tweak/ntp_errors branch January 12, 2025 19:17

PromoFaux mentioned this pull request Feb 18, 2025

Pi-hole FTL v6.0 #2153

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tweak NTP error reporting #2125

Tweak NTP error reporting #2125

DL6ER commented Nov 30, 2024

pralor-bot commented Nov 30, 2024

pralor-bot commented Dec 10, 2024

sawsanders commented Dec 16, 2024 •

edited

Loading

yubiuser commented Dec 16, 2024

DL6ER commented Dec 16, 2024 •

edited

Loading

DL6ER commented Dec 17, 2024

sawsanders commented Dec 22, 2024

github-actions bot commented Jan 11, 2025

github-actions bot commented Jan 11, 2025

yubiuser commented Jan 11, 2025

yubiuser left a comment

DL6ER commented Jan 12, 2025

yubiuser left a comment

yubiuser left a comment

pralor-bot commented Jan 14, 2025

Tweak NTP error reporting #2125

Tweak NTP error reporting #2125

Conversation

DL6ER commented Nov 30, 2024

What does this implement/fix?

Checklist:

pralor-bot commented Nov 30, 2024

pralor-bot commented Dec 10, 2024

sawsanders commented Dec 16, 2024 • edited Loading

yubiuser commented Dec 16, 2024

DL6ER commented Dec 16, 2024 • edited Loading

DL6ER commented Dec 17, 2024

sawsanders commented Dec 22, 2024

github-actions bot commented Jan 11, 2025

github-actions bot commented Jan 11, 2025

yubiuser commented Jan 11, 2025

yubiuser left a comment

Choose a reason for hiding this comment

DL6ER commented Jan 12, 2025

yubiuser left a comment

Choose a reason for hiding this comment

yubiuser left a comment

Choose a reason for hiding this comment

pralor-bot commented Jan 14, 2025

sawsanders commented Dec 16, 2024 •

edited

Loading

DL6ER commented Dec 16, 2024 •

edited

Loading