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

feat(nvidia): move event type to common, define xid/sxid event level in the list #297

Merged
merged 3 commits into from
Jan 22, 2025
Merged

feat(nvidia): move event type to common, define xid/sxid event level in the list #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a17c78
feat(nvidia): move event type to common, define xid/sxid event level …
gyuho Jan 21, 2025
5bd203f
remove
gyuho Jan 22, 2025
1f3f99a
fix
gyuho Jan 22, 2025
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
5 changes: 3 additions & 2 deletions components/accelerator/nvidia/error-xid-sxid/component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
nvidia_error_xid_sxid_id "github.com/leptonai/gpud/components/accelerator/nvidia/error-xid-sxid/id"
nvidia_query "github.com/leptonai/gpud/components/accelerator/nvidia/query"
nvidia_xid_sxid_state "github.com/leptonai/gpud/components/accelerator/nvidia/query/xid-sxid-state"
"github.com/leptonai/gpud/components/common"
"github.com/leptonai/gpud/components/query"
"github.com/leptonai/gpud/log"

Expand Down Expand Up @@ -92,7 +93,7 @@
convertedEvents = append(convertedEvents, components.Event{
Time: metav1.Time{Time: time.Unix(event.UnixSeconds, 0).UTC()},
Name: EventNameErroXid,
Type: components.EventTypeCritical,
Type: common.EventTypeCritical,

Check warning on line 96 in components/accelerator/nvidia/error-xid-sxid/component.go

View check run for this annotation

Codecov / codecov/patch

components/accelerator/nvidia/error-xid-sxid/component.go#L96 

Added line #L96 was not covered by tests
Message: msg,
ExtraInfo: map[string]string{
EventKeyUnixSeconds: strconv.FormatInt(event.UnixSeconds, 10),
Expand All @@ -114,7 +115,7 @@
convertedEvents = append(convertedEvents, components.Event{
Time: metav1.Time{Time: time.Unix(event.UnixSeconds, 0).UTC()},
Name: EventNameErroSXid,
Type: components.EventTypeCritical,
Type: common.EventTypeCritical,

Check warning on line 118 in components/accelerator/nvidia/error-xid-sxid/component.go

View check run for this annotation

Codecov / codecov/patch

components/accelerator/nvidia/error-xid-sxid/component.go#L118 

Added line #L118 was not covered by tests
Message: msg,
ExtraInfo: map[string]string{
EventKeyUnixSeconds: strconv.FormatInt(event.UnixSeconds, 10),
Expand Down
14 changes: 9 additions & 5 deletions components/accelerator/nvidia/error/sxid/component_output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

"github.com/leptonai/gpud/components"
nvidia_query_sxid "github.com/leptonai/gpud/components/accelerator/nvidia/query/sxid"
"github.com/leptonai/gpud/components/common"
"github.com/leptonai/gpud/log"

"github.com/dustin/go-humanize"
Expand Down Expand Up @@ -88,18 +89,21 @@

sxid := uint64(de.Detail.SXid)

reason.Errors = append(reason.Errors, SXidError{
sxidErr := SXidError{

Check warning on line 92 in components/accelerator/nvidia/error/sxid/component_output.go

View check run for this annotation

Codecov / codecov/patch

components/accelerator/nvidia/error/sxid/component_output.go#L92 

Added line #L92 was not covered by tests
Time: de.LogItem.Time,

DataSource: "dmesg",

DeviceUUID: de.DeviceUUID,

SXid: sxid,
}
if de.Detail != nil {
sxidErr.SuggestedActionsByGPUd = de.Detail.SuggestedActionsByGPUd
sxidErr.CriticalErrorMarkedByGPUd = de.Detail.CriticalErrorMarkedByGPUd
}

Check warning on line 104 in components/accelerator/nvidia/error/sxid/component_output.go

View check run for this annotation

Codecov / codecov/patch

components/accelerator/nvidia/error/sxid/component_output.go#L100-L104 

Added lines #L100 - L104 were not covered by tests

SuggestedActionsByGPUd: de.Detail.SuggestedActionsByGPUd,
CriticalErrorMarkedByGPUd: de.Detail.CriticalErrorMarkedByGPUd,
})
reason.Errors = append(reason.Errors, sxidErr)

Check warning on line 106 in components/accelerator/nvidia/error/sxid/component_output.go

View check run for this annotation

Codecov / codecov/patch

components/accelerator/nvidia/error/sxid/component_output.go#L106 

Added line #L106 was not covered by tests
}

sort.Slice(reason.Errors, func(i, j int) bool {
Expand Down Expand Up @@ -145,7 +149,7 @@
des = append(des, components.Event{
Time: sxidErr.Time,
Name: EventNameErroSXid,
Type: components.EventTypeCritical,
Type: common.EventTypeCritical,

Check warning on line 152 in components/accelerator/nvidia/error/sxid/component_output.go

View check run for this annotation

Codecov / codecov/patch

components/accelerator/nvidia/error/sxid/component_output.go#L152 

Added line #L152 was not covered by tests
Message: msg,
ExtraInfo: map[string]string{
EventKeyErroSXidUnixSeconds: strconv.FormatInt(sxidErr.Time.Unix(), 10),
Expand Down
20 changes: 12 additions & 8 deletions components/accelerator/nvidia/error/xid/component_output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
suggestedActions = o.NVMLXidEvent.Detail.SuggestedActionsByGPUd
}

reason.Errors = append(reason.Errors, XidError{
xidErr := XidError{
Time: o.NVMLXidEvent.Time,

DataSource: "nvml",
Expand All @@ -136,7 +136,9 @@

SuggestedActionsByGPUd: suggestedActions,
CriticalErrorMarkedByGPUd: o.NVMLXidEvent.Detail != nil && o.NVMLXidEvent.Detail.CriticalErrorMarkedByGPUd,
})
}

reason.Errors = append(reason.Errors, xidErr)
}

for _, de := range o.DmesgErrors {
Expand All @@ -145,19 +147,21 @@
}

xid := uint64(de.Detail.Xid)

reason.Errors = append(reason.Errors, XidError{
xidErr := XidError{
Time: de.LogItem.Time,

DataSource: "dmesg",

DeviceUUID: de.DeviceUUID,

Xid: xid,
}
if de.Detail != nil {
xidErr.SuggestedActionsByGPUd = de.Detail.SuggestedActionsByGPUd
xidErr.CriticalErrorMarkedByGPUd = de.Detail.CriticalErrorMarkedByGPUd
}

SuggestedActionsByGPUd: de.Detail.SuggestedActionsByGPUd,
CriticalErrorMarkedByGPUd: de.Detail.CriticalErrorMarkedByGPUd,
})
reason.Errors = append(reason.Errors, xidErr)
}

sort.Slice(reason.Errors, func(i, j int) bool {
Expand Down Expand Up @@ -203,7 +207,7 @@
des = append(des, components.Event{
Time: xidErr.Time,
Name: EventNameErroXid,
Type: components.EventTypeCritical,
Type: common.EventTypeCritical,

Check warning on line 210 in components/accelerator/nvidia/error/xid/component_output.go

View check run for this annotation

Codecov / codecov/patch

components/accelerator/nvidia/error/xid/component_output.go#L210 

Added line #L210 was not covered by tests
Message: msg,
ExtraInfo: map[string]string{
EventKeyErroXidUnixSeconds: strconv.FormatInt(xidErr.Time.Unix(), 10),
Expand Down
3 changes: 2 additions & 1 deletion components/accelerator/nvidia/fabric-manager/component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/leptonai/gpud/components"
nvidia_query "github.com/leptonai/gpud/components/accelerator/nvidia/query"
fabric_manager_log "github.com/leptonai/gpud/components/accelerator/nvidia/query/fabric-manager-log"
"github.com/leptonai/gpud/components/common"
"github.com/leptonai/gpud/components/query"
query_log "github.com/leptonai/gpud/components/query/log"
"github.com/leptonai/gpud/log"
Expand Down Expand Up @@ -142,7 +143,7 @@ func (c *component) Events(ctx context.Context, since time.Time) ([]components.E
evs = append(evs, components.Event{
Time: ev.Time,
Name: Name,
Type: components.EventTypeCritical,
Type: common.EventTypeCritical,
ExtraInfo: map[string]string{
EventKeyFabricManagerNVSwitchLogUnixSeconds: fmt.Sprintf("%d", ev.Time.Unix()),
EventKeyFabricManagerNVSwitchLogLine: ev.Line,
Expand Down
3 changes: 2 additions & 1 deletion components/accelerator/nvidia/hw-slowdown/component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
nvidia_hw_slowdown_state "github.com/leptonai/gpud/components/accelerator/nvidia/hw-slowdown/state"
nvidia_query "github.com/leptonai/gpud/components/accelerator/nvidia/query"
nvidia_query_metrics_clock "github.com/leptonai/gpud/components/accelerator/nvidia/query/metrics/clock"
"github.com/leptonai/gpud/components/common"
"github.com/leptonai/gpud/components/query"
"github.com/leptonai/gpud/log"

Expand Down Expand Up @@ -172,7 +173,7 @@
convertedEvents = append(convertedEvents, components.Event{
Time: metav1.Time{Time: time.Unix(event.Timestamp, 0).UTC()},
Name: EventNameHWSlowdown,
Type: components.EventTypeWarning,
Type: common.EventTypeWarning,

Check warning on line 176 in components/accelerator/nvidia/hw-slowdown/component.go

View check run for this annotation

Codecov / codecov/patch

components/accelerator/nvidia/hw-slowdown/component.go#L176 

Added line #L176 was not covered by tests
Message: strings.Join(event.Reasons, ", "),
ExtraInfo: map[string]string{
EventKeyGPUUUID: event.GPUUUID,
Expand Down
3 changes: 2 additions & 1 deletion components/accelerator/nvidia/nccl/component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
nvidia_common "github.com/leptonai/gpud/components/accelerator/nvidia/common"
nvidia_nccl_id "github.com/leptonai/gpud/components/accelerator/nvidia/nccl/id"
nvidia_query "github.com/leptonai/gpud/components/accelerator/nvidia/query"
"github.com/leptonai/gpud/components/common"
"github.com/leptonai/gpud/components/dmesg"
"github.com/leptonai/gpud/components/query"
"github.com/leptonai/gpud/log"
Expand Down Expand Up @@ -107,7 +108,7 @@
events = append(events, components.Event{
Time: logItem.Time,
Name: EventNameNCCLSegfaultInLibncclFromDmesg,
Type: components.EventTypeCritical,
Type: common.EventTypeCritical,

Check warning on line 111 in components/accelerator/nvidia/nccl/component.go

View check run for this annotation

Codecov / codecov/patch

components/accelerator/nvidia/nccl/component.go#L111 

Added line #L111 was not covered by tests
ExtraInfo: map[string]string{
EventKeyNCCLSegfaultInLibncclFromDmesgUnixSeconds: strconv.FormatInt(logItem.Time.Unix(), 10),
EventKeyNCCLSegfaultInLibncclFromDmesgLogLine: logItem.Line,
Expand Down
3 changes: 2 additions & 1 deletion components/accelerator/nvidia/peermem/component.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
nvidia_common "github.com/leptonai/gpud/components/accelerator/nvidia/common"
nvidia_peermem_id "github.com/leptonai/gpud/components/accelerator/nvidia/peermem/id"
nvidia_query "github.com/leptonai/gpud/components/accelerator/nvidia/query"
"github.com/leptonai/gpud/components/common"
"github.com/leptonai/gpud/components/dmesg"
"github.com/leptonai/gpud/components/query"
"github.com/leptonai/gpud/log"
Expand Down Expand Up @@ -164,7 +165,7 @@
events = append(events, components.Event{
Time: logItem.Time,
Name: EventNamePeermemInvalidContextFromDmesg,
Type: components.EventTypeCritical,
Type: common.EventTypeCritical,

Check warning on line 168 in components/accelerator/nvidia/peermem/component.go

View check run for this annotation

Codecov / codecov/patch

components/accelerator/nvidia/peermem/component.go#L168 

Added line #L168 was not covered by tests
ExtraInfo: map[string]string{
EventKeyPeermemInvalidContextFromDmesgUnixSeconds: strconv.FormatInt(logItem.Time.Unix(), 10),
EventKeyPeermemInvalidContextFromDmesgLogLine: logItem.Line,
Expand Down
Loading
Loading