Handle chronyd restarting when disabled

josephdrichard · josephdrichard · commit f2c79cdfcb73 · 2025-12-11T16:38:54.000-07:00
diff --git a/addons/generic/ntpfailover.go b/addons/generic/ntpfailover.go
@@ -46,7 +46,8 @@ const (
 )
 
 var (
-	ts2phcOffsetRegex = regexp.MustCompile("offset .*s[23] freq")
+	ts2phcOffsetRegex  = regexp.MustCompile("offset .*s[23] freq")
+	chronydOnlineRegex = regexp.MustCompile("chronyd .* starting")
 )
 
 func onPTPConfigChangeNtpFailover(data *interface{}, nodeProfile *ptpv1.PtpProfile) error {
@@ -167,6 +168,12 @@ func processLogNtpFailover(data *interface{}, pname string, log string) string {
 								continue
 							}
 						}
+						if pname == chronydPname && chronydOnlineRegex.MatchString(log) {
+							chronydSetEnabled, ok := pluginData.cmdSetEnabled[chronydPname]
+							if ok {
+								chronydSetEnabled(false)
+							}
+						}
 						break done
 					case pcsmsOutOfSpec:
 						if pname == ts2phcPname {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ const (`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	`var (`
`49`		`- ts2phcOffsetRegex = regexp.MustCompile("offset .*s[23] freq")`
	`49`	`+ ts2phcOffsetRegex = regexp.MustCompile("offset .*s[23] freq")`
	`50`	`+ chronydOnlineRegex = regexp.MustCompile("chronyd .* starting")`
`50`	`51`	`)`
`51`	`52`
`52`	`53`	`func onPTPConfigChangeNtpFailover(data interface{}, nodeProfile ptpv1.PtpProfile) error {`
`@@ -167,6 +168,12 @@ func processLogNtpFailover(data *interface{}, pname string, log string) string {`
`167`	`168`	`continue`
`168`	`169`	`}`
`169`	`170`	`}`
	`171`	`+ if pname == chronydPname && chronydOnlineRegex.MatchString(log) {`
	`172`	`+ chronydSetEnabled, ok := pluginData.cmdSetEnabled[chronydPname]`
	`173`	`+ if ok {`
	`174`	`+ chronydSetEnabled(false)`
	`175`	`+ }`
	`176`	`+ }`
`170`	`177`	`break done`
`171`	`178`	`case pcsmsOutOfSpec:`
`172`	`179`	`if pname == ts2phcPname {`