Superminaren
/
kvm
mirror of https://github.com/jetkvm/kvm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(ntp): prevent panic on NTP query error and add IPv6 server in defaultNTPServers

This commit is contained in:
Qishuai Liu 2025-05-06 22:50:27 +09:00
parent d79f359c43
commit 77089ea497
No known key found for this signature in database
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
internal/timesync/ntp.go
View File

@ -13,7 +13,8 @@ var defaultNTPServers = []string{
"time.aws.com", "time.aws.com",
"time.windows.com", "time.windows.com",
"time.google.com", "time.google.com",
"162.159.200.123", // time.cloudflare.com "162.159.200.123", // time.cloudflare.com IPv4
"2606:4700:f1::123", // time.cloudflare.com IPv6
"0.pool.ntp.org", "0.pool.ntp.org",
"1.pool.ntp.org", "1.pool.ntp.org",
"2.pool.ntp.org", "2.pool.ntp.org",
@ -57,6 +58,12 @@ func (t *TimeSync) queryMultipleNTP(servers []string, timeout time.Duration) (no
// query the server // query the server
now, response, err := queryNtpServer(server, timeout) now, response, err := queryNtpServer(server, timeout)
if err != nil {
scopedLogger.Warn().
Str("error", err.Error()).
Msg("failed to query NTP server")
return
}
// set the last RTT // set the last RTT
metricNtpServerLastRTT.WithLabelValues( metricNtpServerLastRTT.WithLabelValues(
@ -76,26 +83,20 @@ func (t *TimeSync) queryMultipleNTP(servers []string, timeout time.Duration) (no
strconv.Itoa(int(response.Precision)), strconv.Itoa(int(response.Precision)),
).Set(1) ).Set(1)
if err == nil { // increase success count
// increase success count metricNtpTotalSuccessCount.Inc()
metricNtpTotalSuccessCount.Inc() metricNtpSuccessCount.WithLabelValues(server).Inc()
metricNtpSuccessCount.WithLabelValues(server).Inc()
scopedLogger.Info(). scopedLogger.Info().
Str("time", now.Format(time.RFC3339)). Str("time", now.Format(time.RFC3339)).
Str("reference", response.ReferenceString()). Str("reference", response.ReferenceString()).
Str("rtt", response.RTT.String()). Str("rtt", response.RTT.String()).
Str("clockOffset", response.ClockOffset.String()). Str("clockOffset", response.ClockOffset.String()).
Uint8("stratum", response.Stratum). Uint8("stratum", response.Stratum).
Msg("NTP server returned time") Msg("NTP server returned time")
results <- &ntpResult{ results <- &ntpResult{
now: now, now: now,
offset: &response.ClockOffset, offset: &response.ClockOffset,
}
} else {
scopedLogger.Warn().
Str("error", err.Error()).
Msg("failed to query NTP server")
} }
}(server) }(server)
} }