Skip to content
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

Jump to bottom

[WIP] Status matrics test fix #275

Closed
wants to merge 2 commits into from
Closed

[WIP] Status matrics test fix #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93ee8cd
fix multipleproces and nmea metrics
aneeshkp Nov 30, 2023
6493fe4
fix unit tests
jzding Nov 30, 2023
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ docker-build: #test ## Build docker image with the manager.
docker build --no-cache -t ${IMG} .

docker-push: ## Push docker image with the manager.
docker push ${IMG}
docker push ${IMG}

docker-build-consumer: #test ## Build docker image with the manager.
docker build -f ./examples/consumer.Dockerfile -t ${CONSUMER_IMG} .
Expand Down
107 changes: 78 additions & 29 deletions plugins/ptp_operator/event/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,14 @@ const (
DPLL ClockSourceType = "dpll"
)

// DependingClockState ...
type DependingClockState []*ClockState

// PTPEventState ...
type PTPEventState struct {
sync.Mutex
CurrentPTPStateEvent ptp.SyncState
DependsOn map[string]*ClockState
DependsOn map[string]DependingClockState // [dpll][ens2f0]State
Type ptp.EventType
}

Expand All @@ -56,7 +59,7 @@ type ClockState struct {
Value map[string]int64
Metric map[string]*PMetric
NodeName string
HelpText string
HelpText map[string]string
}

// PMetric ...
Expand All @@ -66,14 +69,43 @@ type PMetric struct {
metricCounter *prometheus.Counter
}

func (dt *DependingClockState) hasClockState(iface string) (int, *ClockState) {
for index, dep := range *dt {
if *dep.IFace == iface {
return index, dep
}
}
return -1, nil
}

func (dt *DependingClockState) hasMetric() map[string]*PMetric {
for _, dep := range *dt {
return dep.Metric
}
return nil
}
func (dt *DependingClockState) hasMetricHelp() map[string]string {
for _, dep := range *dt {
return dep.HelpText
}
return nil
}

// UpdateCurrentEventState ...
func (p *PTPEventState) UpdateCurrentEventState(c ClockState) ptp.SyncState {
p.Lock()
defer func() {
p.Unlock()
}()
// if the current state is not locked and the new state is locked then update the current state
if d, ok := p.DependsOn[c.Process]; ok {
if dep, ok := p.DependsOn[c.Process]; ok {
index, d := dep.hasClockState(*c.IFace)
// update the clock state if found or else
if index == -1 {
d = &ClockState{}
dep = append(dep, d)
}

d.Offset = c.Offset
d.State = c.State
d.Process = c.Process
Expand All @@ -83,13 +115,17 @@ func (p *PTPEventState) UpdateCurrentEventState(c ClockState) ptp.SyncState {
if c.Offset != nil {
d.Offset = pointer.Float64(*c.Offset)
}
p.DependsOn[c.Process] = d

for k, v := range c.Value {
iface := ""
if d.IFace != nil {
iface = *d.IFace
}
if d.Metric[k].metricGauge == nil {
if d.Metric == nil {
d.Metric = dep.hasMetric()
d.HelpText = dep.hasMetricHelp()
}
if d.Metric[k].metricGauge != nil {
d.Metric[k].metricGauge.With(map[string]string{"from": d.Process, "process": d.Process,
"node": d.NodeName, "iface": iface}).Set(float64(v))
}
Expand Down Expand Up @@ -117,7 +153,12 @@ func (p *PTPEventState) UpdateCurrentEventState(c ClockState) ptp.SyncState {
Namespace: ptpNamespace,
Subsystem: ptpSubsystem,
Name: k,
Help: c.HelpText,
Help: func() string {
if h, ok2 := c.HelpText[k]; ok2 {
return h
}
return ""
}(),
}, []string{"from", "process", "node", "iface"}),
metricCounter: nil,
}
Expand All @@ -135,22 +176,24 @@ func (p *PTPEventState) UpdateCurrentEventState(c ClockState) ptp.SyncState {
"node": clockState.NodeName, "iface": alias}).Set(float64(v))
}
clockState.Metric = metrics
p.DependsOn[c.Process] = clockState
p.DependsOn[c.Process] = []*ClockState{clockState}
}

// if all locked then its locked
// if anyone HOLDOVER then holdover
// if anyone FREERUN then freerun
var currentState ptp.SyncState
for _, v := range p.DependsOn {
if v.State != ptp.LOCKED {
if v.State == ptp.HOLDOVER {
currentState = v.State
break
for _, dd := range v {
if dd.State != ptp.LOCKED {
if dd.State == ptp.HOLDOVER {
currentState = dd.State
break
}
currentState = dd.State
} else if currentState == "" {
currentState = dd.State
}
currentState = v.State
} else if currentState == "" {
currentState = v.State
}
}
p.CurrentPTPStateEvent = currentState
Expand All @@ -162,9 +205,11 @@ func (p *PTPEventState) UnRegisterMetrics(processName string) {
// write a functions to unregister metric from dependence on object
if d, ok := p.DependsOn[processName]; ok {
// write loop d.Metric
if d.Metric != nil {
for _, v := range d.Metric {
prometheus.Unregister(v.metricGauge)
for _, dd := range d {
if dd.Metric != nil {
for _, v := range dd.Metric {
prometheus.Unregister(v.metricGauge)
}
}
}
}
Expand All @@ -180,11 +225,13 @@ func (p *PTPEventState) UnRegisterAllMetrics() {
}
for _, d := range p.DependsOn {
// write loop d.Metric
if d.Metric != nil {
// unregister metric
for _, v := range d.Metric {
prometheus.Unregister(v.metricGauge)
delete(p.DependsOn, d.Process)
for _, dd := range d {
if dd.Metric != nil {
// unregister metric
for _, v := range dd.Metric {
prometheus.Unregister(v.metricGauge)
delete(p.DependsOn, dd.Process)
}
}
}
}
Expand All @@ -200,15 +247,17 @@ func (p *PTPEventState) DeleteAllMetrics() {
}
for _, d := range p.DependsOn {
// write loop d.Metric
if d.Metric != nil {
// unregister metric
for _, v := range d.Metric {
if v.metricGauge != nil && d.IFace != nil {
v.metricGauge.Delete(prometheus.Labels{"process": d.Process, "iface": *d.IFace, "node": d.NodeName})
prometheus.Unregister(v.metricGauge)
for _, dd := range d {
if dd.Metric != nil {
// unregister metric
for _, v := range dd.Metric {
if v.metricGauge != nil && dd.IFace != nil {
v.metricGauge.Delete(prometheus.Labels{"process": dd.Process, "iface": *dd.IFace, "node": dd.NodeName})
prometheus.Unregister(v.metricGauge)
}
}
}
delete(p.DependsOn, dd.Process)
}
delete(p.DependsOn, d.Process)
}
}
107 changes: 63 additions & 44 deletions plugins/ptp_operator/event/event_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,33 @@ var testCase = []eventTestCase{{
eventStateObject: &event.PTPEventState{
CurrentPTPStateEvent: ptp.FREERUN,
Type: ptp.PtpStateChange,
DependsOn: map[string]*event.ClockState{"GNSS": {
State: ptp.FREERUN,
Offset: pointer.Float64(0),
Process: "GNSS",
}, "DPLL": {
State: ptp.FREERUN,
Offset: pointer.Float64(45670),
Process: "DPLL",

DependsOn: map[string]event.DependingClockState{
"TS2phc": {
&event.ClockState{
State: ptp.FREERUN,
Offset: pointer.Float64(01),
IFace: nil,
Process: "GNSS",
ClockSource: "",
Value: nil,
Metric: nil,
NodeName: "",
HelpText: nil,
},
&event.ClockState{
State: ptp.FREERUN,
Offset: pointer.Float64(01),
IFace: nil,
Process: "DPLL",
ClockSource: "",
Value: nil,
Metric: nil,
NodeName: "",
HelpText: nil,
},
},
}},
},
input: inputState{
state: ptp.LOCKED,
process: "GNSS",
Expand All @@ -62,47 +79,49 @@ var testCase = []eventTestCase{{
eventStateObject: &event.PTPEventState{
CurrentPTPStateEvent: ptp.FREERUN,
Type: ptp.PtpStateChange,
DependsOn: map[string]*event.ClockState{"GNSS": {
State: ptp.LOCKED,
Offset: pointer.Float64(1),
Process: "GNSS",
}, "DPLL": {
State: ptp.LOCKED,
Offset: pointer.Float64(2),
Process: "DPLL",
}, "ptp4l": {
State: ptp.FREERUN,
Offset: pointer.Float64(99902),
Process: "ptp4l",
DependsOn: map[string]event.DependingClockState{
"TS2phc": {
&event.ClockState{
State: ptp.LOCKED,
Offset: pointer.Float64(01),
IFace: nil,
Process: "GNSS",
ClockSource: "",
Value: nil,
Metric: nil,
NodeName: "",
HelpText: nil,
},
&event.ClockState{
State: ptp.LOCKED,
Offset: pointer.Float64(01),
IFace: nil,
Process: "DPLL",
ClockSource: "",
Value: nil,
Metric: nil,
NodeName: "",
HelpText: nil,
},
&event.ClockState{
State: ptp.FREERUN,
Offset: pointer.Float64(99902),
IFace: nil,
Process: "ptp4l",
ClockSource: "",
Value: nil,
Metric: nil,
NodeName: "",
HelpText: nil,
},
},
}},
},
input: inputState{
state: ptp.LOCKED,
process: "ptp4l",
offset: pointer.Float64(05),
},
expectedState: ptp.LOCKED,
},
{
eventStateObject: &event.PTPEventState{
CurrentPTPStateEvent: ptp.HOLDOVER,
Type: ptp.PtpStateChange,
DependsOn: map[string]*event.ClockState{"pch2sys": {
State: ptp.LOCKED,
Offset: pointer.Float64(01),
Process: "phc2sys",
}, "ts2phc": {
State: ptp.HOLDOVER,
Offset: pointer.Float64(02),
Process: "ts2phc",
}},
},
input: inputState{
state: ptp.LOCKED,
process: "ts2phc",
offset: pointer.Float64(03),
},
expectedState: ptp.LOCKED,
expectedState: ptp.FREERUN,
},
}

Expand Down
Loading
Loading