Skip to content

[release-4.14] OCPBUGS-56144: Set pmc for TimeTraceable change #441

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 14, 2025
Merged

[release-4.14] OCPBUGS-56144: Set pmc for TimeTraceable change #441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/event/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ connect:
}
}

func (e *EventHandler) updateCLockClass(cfgName string, clkClass fbprotocol.ClockClass, clockType ClockType,
func (e *EventHandler) updateClockClass(cfgName string, clkClass fbprotocol.ClockClass, clockType ClockType,
gmGetterFn func(string) (protocol.GrandmasterSettings, error),
gmSetterFn func(string, protocol.GrandmasterSettings) error) (err error, clockClass fbprotocol.ClockClass) {
g, err := gmGetterFn(cfgName)
Expand All @@ -733,8 +733,8 @@ func (e *EventHandler) updateCLockClass(cfgName string, clkClass fbprotocol.Cloc
g.TimePropertiesDS.CurrentUtcOffset = int32(leap.GetUtcOffset())
switch clkClass {
case fbprotocol.ClockClass6: // T-GM connected to a PRTC in locked mode (e.g., PRTC traceable to GNSS)
// update only when ClockClass is changed or clockAccuracy changes
if g.ClockQuality.ClockClass != fbprotocol.ClockClass6 {
// update only when ClockClass is changed
if g.ClockQuality.ClockClass != fbprotocol.ClockClass6 || g.TimePropertiesDS.TimeTraceable != true {
g.ClockQuality.ClockClass = fbprotocol.ClockClass6
g.TimePropertiesDS.TimeTraceable = true
g.TimePropertiesDS.TimeSource = fbprotocol.TimeSourceGNSS
Expand Down Expand Up @@ -936,7 +936,7 @@ func (e *EventHandler) addEvent(event EventChannel) *DataDetails {

// UpdateClockClass ... update clock class
func (e *EventHandler) UpdateClockClass(c net.Conn, clk ClockClassRequest) {
classErr, clockClass := e.updateCLockClass(clk.cfgName, clk.clockClass, clk.clockType,
classErr, clockClass := e.updateClockClass(clk.cfgName, clk.clockClass, clk.clockType,
PMCGMGetter, PMCGMSetter)
glog.Infof("received %s,%v,%s", clk.cfgName, clk.clockClass, clk.clockType)
if classErr != nil {
Expand Down