Skip to content

Commit

Permalink
Process ts2phc and dpll events for multi-cards
Browse files Browse the repository at this point in the history 
Signed-off-by: Jack Ding <jackding@gmail.com>
  • Loading branch information
@jzding
jzding committed Nov 27, 2023
1 parent 0faa983 commit 69d75b5
Show file tree
Hide file tree
Showing 11 changed files with 1,329 additions and 143 deletions.
4 changes: 3 additions & 1 deletion plugins/ptp_operator/event/event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,10 @@ func (p *PTPEventState) UpdateCurrentEventState(c ClockState) ptp.SyncState {
if clockState.IFace != nil {
iface = *clockState.IFace
}
r := []rune(iface)
alias := string(r[:len(r)-1]) + "x"
metrics[k].metricGauge.With(map[string]string{"from": clockState.Process, "process": clockState.Process,
"node": clockState.NodeName, "iface": iface}).Set(float64(v))
"node": clockState.NodeName, "iface": alias}).Set(float64(v))
}
clockState.Metric = metrics
p.DependsOn[c.Process] = clockState
Expand Down
85 changes: 66 additions & 19 deletions plugins/ptp_operator/metrics/logparser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,40 @@ func extractRegularMetrics(processName, output string) (interfaceName string, pt
return
}

func extractNmeaMetrics(processName, output string) (interfaceName string, status, ptpOffset float64) {
// ts2phc[1699929121]:[ts2phc.0.config] ens2f0 nmea_status 0 offset 999999 s0
var err error
index := FindInLogForCfgFileIndex(output)
if index == -1 {
log.Errorf("config name is not found in log outpt")
return
}

output = strings.Replace(output, "path", "", 1)
replacer := strings.NewReplacer("[", " ", "]", " ", ":", " ", "phc", "", "sys", "")
output = replacer.Replace(output)

output = output[index:]
fields := strings.Fields(output)

// 0 1 2 3 4 5 6
// ts2phc.0.config ens2f0 nmea_status 0 offset 999999 s0
if len(fields) < 7 {
return
}

interfaceName = fields[1]
status, err = strconv.ParseFloat(fields[3], 64)
if err != nil {
log.Errorf("%s failed to parse nmea status from master output %s error %v", processName, fields[3], err)
}
ptpOffset, err = strconv.ParseFloat(fields[5], 64)
if err != nil {
log.Errorf("%s failed to parse nmea offset from master output %s error %v", processName, fields[5], err)
}
return
}

// ExtractPTP4lEvent ... extract event form ptp4l logs
//
// "INITIALIZING to LISTENING on INIT_COMPLETE"
Expand Down Expand Up @@ -319,21 +353,21 @@ func (p *PTPEventManager) ParseGMLogs(processName, configName, output string, fi
NodeName: ptpNodeName,
HelpText: "0 = FREERUN, 1 = LOCKED, 2 = HOLDOVER",
}
SyncState.With(map[string]string{"process": processName, "node": ptpNodeName, "iface": iface}).Set(GetSyncStateID(syncState))
alias := getAlias(iface)
SyncState.With(map[string]string{"process": processName, "node": ptpNodeName, "iface": alias}).Set(GetSyncStateID(syncState))
// status metrics
ptpStats[master].SetPtpDependentEventState(clockState)
}

// ParseDPLLLogs ... parse logs for various events
func (p *PTPEventManager) ParseDPLLLogs(processName, configName, output string, fields []string,
ptpStats map[types.IFace]*stats.Stats) {
// dpll[1689282767]:[ts2phc.0.config] ens2f1 phase_status 0 frequency_status 0 offset 0 s0
//dpll[1689014436]:[ts2phc.0.config] ens2f1 frequency_status 0 offset 0 phase_status 0 s0
// 0 1 2 3 4 5 6 7 8 9 10
// dpll 1689014436 ts2phc.0.config ens2f1 frequency_status 0 offset 0 phase_status 0 s0
// dpll[1700598434]:[ts2phc.0.config] ens2f0 frequency_status 3 offset 0 phase_status 3 pps_status 1 s2
// 0 1 2 3 4 5 6 7 8 9 10 11 12
// dpll 1700598434 ts2phc.0.config ens2f0 frequency_status 3 offset 0 phase_status 3 pps_status 1 s2
log.Infof("ParseDPLLLogs: %s", output)
if strings.Contains(output, "frequency_status") {
if len(fields) < 10 {
if len(fields) < 12 {
log.Errorf("DPLL Status is not in right format %s", output)
return
}
Expand All @@ -348,12 +382,13 @@ func (p *PTPEventManager) ParseDPLLLogs(processName, configName, output string,
var phaseStatus int64
var frequencyStatus int64
var dpllOffset float64
var ppsStatus float64
var err error
iface := pointer.String(fields[3])
syncState := fields[10]
syncState := fields[12]
logStatusLoop:
// read 4 ,6 and 8,
for i := 4; i < 9; i = i + 2 { // the order need to be fixed in linux ptp daemon , this is workaround
// read 4, 6, 8 and 10
for i := 4; i < 11; i = i + 2 { // the order need to be fixed in linux ptp daemon , this is workaround
switch fields[i] {
case "frequency_status":
if frequencyStatus, err = strconv.ParseInt(fields[i+1], 10, 64); err != nil {
Expand All @@ -371,14 +406,16 @@ logStatusLoop:
log.Errorf("%s failed to parse offset from the output %s error %s", processName, fields[3], err.Error())
break logStatusLoop
}
case "pps_status":
if ppsStatus, err = strconv.ParseFloat(fields[i+1], 64); err != nil {
log.Errorf("%s failed to parse offset from the output %s error %s", processName, fields[3], err.Error())
break logStatusLoop
}
}
}

if err == nil {
pLabels := map[string]string{"from": processName, "node": ptpNodeName,
"process": processName, "iface": *iface}
PtpOffset.With(pLabels).Set(dpllOffset)
SyncState.With(map[string]string{"process": processName, "node": ptpNodeName, "iface": *iface}).Set(GetSyncStateID(syncState))
alias := getAlias(*iface)
ptpStats[master].SetPtpDependentEventState(event.ClockState{
State: GetSyncState(syncState),
Offset: pointer.Float64(dpllOffset),
Expand All @@ -389,6 +426,15 @@ logStatusLoop:
NodeName: ptpNodeName,
HelpText: "-1=UNKNOWN, 0=INVALID, 1=FREERUN, 2=LOCKED, 3=LOCKED_HO_ACQ, 4=HOLDOVER",
})
masterResource := fmt.Sprintf("%s/%s", alias, MasterClockType)
interfaceType := types.IFace(master)
SyncState.With(map[string]string{"process": processName, "node": ptpNodeName, "iface": alias}).Set(GetSyncStateID(syncState))
if ppsStatus == UNAVAILABLE {
p.GenPTPEvent(processName, ptpStats[interfaceType], masterResource, int64(dpllOffset), ptp.FREERUN, ptp.PtpStateChange)
} else {
UpdatePTPOffsetMetrics(processName, processName, alias, dpllOffset)
}
UpdatePpsStatusMetrics(processName, alias, ppsStatus)
}
}

Expand Down Expand Up @@ -427,11 +473,12 @@ func (p *PTPEventManager) ParseGNSSLogs(processName, configName, output string,

//openshift_ptp_offset_ns{from="gnss",iface="ens2f1",node="cnfde21.ptp.lab.eng.bos.redhat.com",process="gnss"} 0
if err == nil {
alias := getAlias(*iface)
lastState, errState := ptpStats[master].GetStateState(processName)
pLabels := map[string]string{"from": processName, "node": ptpNodeName,
"process": processName, "iface": *iface}
"process": processName, "iface": alias}
PtpOffset.With(pLabels).Set(gnssOffset)
SyncState.With(map[string]string{"process": processName, "node": ptpNodeName, "iface": *iface}).Set(GetSyncStateID(syncState))
SyncState.With(map[string]string{"process": processName, "node": ptpNodeName, "iface": alias}).Set(GetSyncStateID(syncState))
ptpStats[master].SetPtpDependentEventState(event.ClockState{
State: GetSyncState(syncState),
Offset: pointer.Float64(gnssOffset),
Expand All @@ -444,14 +491,14 @@ func (p *PTPEventManager) ParseGNSSLogs(processName, configName, output string,
})
log.Infof("%s last state %s and current state %s", processName, lastState, GetSyncState(syncState))
if lastState != GetSyncState(syncState) || errState != nil {
var alias string
var masterAlias string
if m, ok := ptpStats[master]; ok {
alias = m.Alias()
masterAlias = m.Alias()
}
if alias == "" {
alias, _ = ptp4lCfg.GetUnknownAlias()
masterAlias, _ = ptp4lCfg.GetUnknownAlias()
}
masterResource := fmt.Sprintf("%s/%s", alias, MasterClockType)
masterResource := fmt.Sprintf("%s/%s", masterAlias, MasterClockType)
p.publishGNSSEvent(gnssState, gnssOffset, masterResource, ptp.GnssStateChange)
}
}
Expand Down
13 changes: 7 additions & 6 deletions plugins/ptp_operator/metrics/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,17 +226,18 @@ func (p *PTPEventManager) PublishEvent(state ptp.SyncState, ptpOffset int64, sou
}

func (p *PTPEventManager) publish(data ceevent.Data, eventSource string, eventType ptp.EventType) {
if p.mock {
return
}
if pubs, ok := p.publisherTypes[eventType]; ok {
e, err := common.CreateEvent(pubs.PubID, string(eventType), eventSource, data)
if err != nil {
log.Errorf("failed to create ptp event, %s", err)
return
}
if !p.mock {
if err = common.PublishEventViaAPI(p.scConfig, e); err != nil {
log.Errorf("failed to publish ptp event %v, %s", e, err)
return
}
if err = common.PublishEventViaAPI(p.scConfig, e); err != nil {
log.Errorf("failed to publish ptp event %v, %s", e, err)
return
}
} else {
log.Errorf("failed to publish ptp event due to missing publisher for type %s", string(eventType))
Expand Down Expand Up @@ -283,7 +284,7 @@ func (p *PTPEventManager) GenPTPEvent(ptpProfileName string, oStats *stats.Stats
case ptp.HOLDOVER:
// do nothing, the timeout will switch holdover to FREE-RUN
default: // not yet used states
log.Warnf("unknown %s sync state %s ,has last ptp state %s", eventResourceName, clockState, lastClockState)
log.Warnf("%s sync state %s, last ptp state is unknown: %s", eventResourceName, clockState, lastClockState)
if !isOffsetInRange(ptpOffset, threshold.MaxOffsetThreshold, threshold.MinOffsetThreshold) {
clockState = ptp.FREERUN
}
Expand Down
47 changes: 36 additions & 11 deletions plugins/ptp_operator/metrics/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ const (
PtpProcessDown int64 = 0
// PtpProcessUp process is up
PtpProcessUp int64 = 1

// UNAVAILABLE Nmea and Pps status
UNAVAILABLE float64 = 0
// AVAILABLE Nmea and Pps status
AVAILABLE float64 = 1
)

// ExtractMetrics ... extract metrics from ptp logs.
Expand Down Expand Up @@ -148,10 +153,8 @@ func (p *PTPEventManager) ExtractMetrics(msg string) {
UpdatePTPMetrics(phc, processName, interfaceName, ptpOffset, maxPtpOffset, frequencyAdjustment, delay)
case MasterClockType:
ptpInterface, _ = ptp4lCfg.ByRole(types.SLAVE)
var alias string
if ptpInterface.Name != "" {
r := []rune(ptpInterface.Name)
alias = string(r[:len(r)-1]) + "x"
alias := getAlias(ptpInterface.Name)
ptpStats[master].SetAlias(alias)
UpdatePTPMetrics(master, processName, alias, ptpOffset, maxPtpOffset, frequencyAdjustment, delay)
} else {
Expand All @@ -160,13 +163,30 @@ func (p *PTPEventManager) ExtractMetrics(msg string) {
}
default:
if processName == ts2phcProcessName {
var alias string
r := []rune(interfaceName)
alias = string(r[:len(r)-1]) + "x"
alias := getAlias(interfaceName)
ptpStats[master].SetAlias(alias)
UpdatePTPMetrics(master, processName, alias, ptpOffset, maxPtpOffset, frequencyAdjustment, delay)
}
}
} else if strings.Contains(output, "nmea_status") &&
processName == ts2phcProcessName {
// ts2phc[1699929121]:[ts2phc.0.config] ens2f0 nmea_status 0 offset 999999 s0
interfaceName, status, ptpOffset := extractNmeaMetrics(processName, output)

offsetSource := master
interfaceType := types.IFace(master)
// ts2phc return actual interface name unlike ptp4l
ptpInterface = ptp4lconf.PTPInterface{Name: interfaceName}

alias := getAlias(interfaceName)
ptpStats[master].SetAlias(alias)
masterResource := fmt.Sprintf("%s/%s", alias, MasterClockType)
if status == UNAVAILABLE {
p.GenPTPEvent(profileName, ptpStats[interfaceType], masterResource, int64(ptpOffset), ptp.FREERUN, ptp.PtpStateChange)
} else {
UpdatePTPOffsetMetrics(offsetSource, processName, alias, ptpOffset)
}
UpdateNmeaStatusMetrics(processName, alias, status)
} else if strings.Contains(output, " offset ") &&
(processName != gnssProcessName && processName != dpllProcessName && processName != gmProcessName) {
// ptp4l[5196819.100]: [ptp4l.0.config] master offset -2162130 s2 freq +22451884 path delay 374976
Expand Down Expand Up @@ -242,8 +262,7 @@ func (p *PTPEventManager) ExtractMetrics(msg string) {
if ptpInterface.Name != "" {
alias := ptpStats[interfaceType].Alias()
if alias == "" {
r := []rune(ptpInterface.Name)
alias = string(r[:len(r)-1]) + "x"
alias = getAlias(ptpInterface.Name)
ptpStats[interfaceType].SetAlias(alias)
}
masterResource := fmt.Sprintf("%s/%s", alias, MasterClockType)
Expand All @@ -255,9 +274,7 @@ func (p *PTPEventManager) ExtractMetrics(msg string) {
}
default:
if masterOffsetSource == ts2phcProcessName {
var alias string
r := []rune(interfaceName)
alias = string(r[:len(r)-1]) + "x"
alias := getAlias(interfaceName)
ptpStats[master].SetAlias(alias)
masterResource := fmt.Sprintf("%s/%s", alias, MasterClockType)
p.GenPTPEvent(profileName, ptpStats[interfaceType], masterResource, int64(ptpOffset), syncState, ptp.PtpStateChange)
Expand Down Expand Up @@ -288,3 +305,11 @@ func (p *PTPEventManager) processDownEvent(profileName, processName string, ptpS
}
}
}

func getAlias(iface string) string {
if iface == "" {
return iface
}
r := []rune(iface)
return string(r[:len(r)-1]) + "x"
}
Loading

0 comments on commit 69d75b5

Please sign in to comment.