Skip to content

[release-4.20] OCPBUGS-76939: Set ClockClass for mainClock instead of 'master' #642

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

Open
openshift-cherrypick-robot wants to merge 1 commit into
base: release-4.20
Choose a base branch
from
Open

[release-4.20] OCPBUGS-76939: Set ClockClass for mainClock instead of 'master' #642

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
11 changes: 7 additions & 4 deletions plugins/ptp_operator/metrics/ptp4lParse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,26 @@
log.Errorf("clock class not in right format %s", output)
return
}
ptpStats.CheckSource(master, configName, ptp4lProcessName)
// Use ptpStats.GetMainClockName instead of 'master' for this statistic because clock class is a property
// of the main clock in the case of multiple configurations.
mainClock := ptpStats.GetMainClockName()

Check failure on line 34 in plugins/ptp_operator/metrics/ptp4lParse.go

View workflow job for this annotation

GitHub Actions / Linting 

ptpStats.GetMainClockName undefined (type stats.PTPStats has no field or method GetMainClockName)) (typecheck)

Check failure on line 34 in plugins/ptp_operator/metrics/ptp4lParse.go

View workflow job for this annotation

GitHub Actions / Linting 

ptpStats.GetMainClockName undefined (type stats.PTPStats has no field or method GetMainClockName)) (typecheck)

Check failure on line 34 in plugins/ptp_operator/metrics/ptp4lParse.go

View workflow job for this annotation

GitHub Actions / Linting 

ptpStats.GetMainClockName undefined (type stats.PTPStats has no field or method GetMainClockName)) (typecheck)

Check failure on line 34 in plugins/ptp_operator/metrics/ptp4lParse.go

View workflow job for this annotation

GitHub Actions / Linting 

ptpStats.GetMainClockName undefined (type stats.PTPStats has no field or method GetMainClockName) (typecheck)
ptpStats.CheckSource(mainClock, configName, ptp4lProcessName)
// ptp4l 1646672953 ptp4l.0.config CLOCK_CLASS_CHANGE 165.000000
var clockClass float64
clockClass, err = strconv.ParseFloat(fields[4], 64)
if err != nil {
log.Error("error parsing clock class change")
} else if ptpStats[master].ClockClass() != int64(clockClass) { // only if there is a change
} else if ptpStats[mainClock].ClockClass() != int64(clockClass) { // only if there is a change
var alias string
if m, ok := ptpStats[master]; ok {
if m, ok := ptpStats[mainClock]; ok {
alias = m.Alias()
}
if alias == "" {
alias, _ = ptp4lCfg.GetUnknownAlias()
}
masterResource := fmt.Sprintf("%s/%s", alias, MasterClockType)

ptpStats[master].SetClockClass(int64(clockClass))
ptpStats[mainClock].SetClockClass(int64(clockClass))
ClockClassMetrics.With(prometheus.Labels{
"process": processName, "config": configName, "node": ptpNodeName}).Set(clockClass)
p.PublishClockClassEvent(clockClass, masterResource, ptp.PtpClockClassChange)
Expand Down
Loading