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.

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/xid, hw slowdown, fuse, PCI): use common events store, simplify nvml poller initialization #336

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 8 deletions components/accelerator/nvidia/bad-envs/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ func New(ctx context.Context, cfg nvidia_common.Config) components.Component {
cfg.Query.SetDefaultsIfNotSet()

cctx, ccancel := context.WithCancel(ctx)
nvidia_query.SetDefaultPoller(
nvidia_query.WithDBRW(cfg.Query.State.DBRW),
nvidia_query.WithDBRO(cfg.Query.State.DBRO),
nvidia_query.WithNvidiaSMICommand(cfg.NvidiaSMICommand),
nvidia_query.WithNvidiaSMIQueryCommand(cfg.NvidiaSMIQueryCommand),
nvidia_query.WithIbstatCommand(cfg.IbstatCommand),
nvidia_query.WithInfinibandClassDirectory(cfg.InfinibandClassDirectory),
)
nvidia_query.GetDefaultPoller().Start(cctx, cfg.Query, bad_envs_id.Name)

return &component{
Expand Down
8 changes: 0 additions & 8 deletions components/accelerator/nvidia/clock-speed/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ func New(ctx context.Context, cfg nvidia_common.Config) components.Component {
cfg.Query.SetDefaultsIfNotSet()

cctx, ccancel := context.WithCancel(ctx)
nvidia_query.SetDefaultPoller(
nvidia_query.WithDBRW(cfg.Query.State.DBRW),
nvidia_query.WithDBRO(cfg.Query.State.DBRO),
nvidia_query.WithNvidiaSMICommand(cfg.NvidiaSMICommand),
nvidia_query.WithNvidiaSMIQueryCommand(cfg.NvidiaSMIQueryCommand),
nvidia_query.WithIbstatCommand(cfg.IbstatCommand),
nvidia_query.WithInfinibandClassDirectory(cfg.InfinibandClassDirectory),
)
nvidia_query.GetDefaultPoller().Start(cctx, cfg.Query, nvidia_clock_speed_id.Name)

return &component{
Expand Down
8 changes: 0 additions & 8 deletions components/accelerator/nvidia/ecc/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ func New(ctx context.Context, cfg nvidia_common.Config) components.Component {
cfg.Query.SetDefaultsIfNotSet()

cctx, ccancel := context.WithCancel(ctx)
nvidia_query.SetDefaultPoller(
nvidia_query.WithDBRW(cfg.Query.State.DBRW),
nvidia_query.WithDBRO(cfg.Query.State.DBRO),
nvidia_query.WithNvidiaSMICommand(cfg.NvidiaSMICommand),
nvidia_query.WithNvidiaSMIQueryCommand(cfg.NvidiaSMIQueryCommand),
nvidia_query.WithIbstatCommand(cfg.IbstatCommand),
nvidia_query.WithInfinibandClassDirectory(cfg.InfinibandClassDirectory),
)
nvidia_query.GetDefaultPoller().Start(cctx, cfg.Query, nvidia_ecc_id.Name)

return &component{
Expand Down
8 changes: 0 additions & 8 deletions components/accelerator/nvidia/error-xid-sxid/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ func New(ctx context.Context, cfg nvidia_common.Config) components.Component {

// this starts the Xid poller via "nvml.StartDefaultInstance"
cctx, ccancel := context.WithCancel(ctx)
nvidia_query.SetDefaultPoller(
nvidia_query.WithDBRW(cfg.Query.State.DBRW),
nvidia_query.WithDBRO(cfg.Query.State.DBRO),
nvidia_query.WithNvidiaSMICommand(cfg.NvidiaSMICommand),
nvidia_query.WithNvidiaSMIQueryCommand(cfg.NvidiaSMIQueryCommand),
nvidia_query.WithIbstatCommand(cfg.IbstatCommand),
nvidia_query.WithInfinibandClassDirectory(cfg.InfinibandClassDirectory),
)
nvidia_query.GetDefaultPoller().Start(cctx, cfg.Query, nvidia_error_xid_sxid_id.Name)

return &component{
Expand Down
8 changes: 0 additions & 8 deletions components/accelerator/nvidia/error/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@ func New(ctx context.Context, cfg nvidia_common.Config) components.Component {
cfg.Query.SetDefaultsIfNotSet()

cctx, ccancel := context.WithCancel(ctx)
nvidia_query.SetDefaultPoller(
nvidia_query.WithDBRW(cfg.Query.State.DBRW),
nvidia_query.WithDBRO(cfg.Query.State.DBRO),
nvidia_query.WithNvidiaSMICommand(cfg.NvidiaSMICommand),
nvidia_query.WithNvidiaSMIQueryCommand(cfg.NvidiaSMIQueryCommand),
nvidia_query.WithIbstatCommand(cfg.IbstatCommand),
nvidia_query.WithInfinibandClassDirectory(cfg.InfinibandClassDirectory),
)
nvidia_query.GetDefaultPoller().Start(cctx, cfg.Query, Name)

return &component{
Expand Down
12 changes: 3 additions & 9 deletions components/accelerator/nvidia/fabric-manager/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,9 @@
cfg.Query.SetDefaultsIfNotSet()

cctx, ccancel := context.WithCancel(ctx)
nvidia_query.SetDefaultPoller(
nvidia_query.WithDBRW(cfg.Log.Query.State.DBRW),
nvidia_query.WithDBRO(cfg.Log.Query.State.DBRO),
nvidia_query.WithNvidiaSMICommand(cfg.NvidiaSMICommand),
nvidia_query.WithNvidiaSMIQueryCommand(cfg.NvidiaSMIQueryCommand),
nvidia_query.WithIbstatCommand(cfg.IbstatCommand),
nvidia_query.WithInfinibandClassDirectory(cfg.InfinibandClassDirectory),
)
nvidia_query.GetDefaultPoller().Start(cctx, cfg.Query, Name)
if nvidia_query.GetDefaultPoller() != nil {
nvidia_query.GetDefaultPoller().Start(cctx, cfg.Query, Name)
}

Check warning on line 27 in components/accelerator/nvidia/fabric-manager/component.go

View check run for this annotation

Codecov / codecov/patch

components/accelerator/nvidia/fabric-manager/component.go#L26-L27

Added lines #L26 - L27 were not covered by tests

if err := cfg.Log.Validate(); err != nil {
ccancel()
Expand Down
8 changes: 0 additions & 8 deletions components/accelerator/nvidia/gsp-firmware-mode/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ func New(ctx context.Context, cfg nvidia_common.Config) components.Component {
cfg.Query.SetDefaultsIfNotSet()

cctx, ccancel := context.WithCancel(ctx)
nvidia_query.SetDefaultPoller(
nvidia_query.WithDBRW(cfg.Query.State.DBRW),
nvidia_query.WithDBRO(cfg.Query.State.DBRO),
nvidia_query.WithNvidiaSMICommand(cfg.NvidiaSMICommand),
nvidia_query.WithNvidiaSMIQueryCommand(cfg.NvidiaSMIQueryCommand),
nvidia_query.WithIbstatCommand(cfg.IbstatCommand),
nvidia_query.WithInfinibandClassDirectory(cfg.InfinibandClassDirectory),
)
nvidia_query.GetDefaultPoller().Start(cctx, cfg.Query, nvidia_gsp_firmware_mode_id.Name)

return &component{
Expand Down
61 changes: 7 additions & 54 deletions components/accelerator/nvidia/hw-slowdown/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,20 @@
"context"
"database/sql"
"fmt"
"strings"
"time"

"github.com/leptonai/gpud/components"
nvidia_common "github.com/leptonai/gpud/components/accelerator/nvidia/common"
nvidia_hw_slowdown_id "github.com/leptonai/gpud/components/accelerator/nvidia/hw-slowdown/id"
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"
events_db "github.com/leptonai/gpud/components/db"
"github.com/leptonai/gpud/components/query"
"github.com/leptonai/gpud/log"

"github.com/dustin/go-humanize"
"github.com/prometheus/client_golang/prometheus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

const (
Expand All @@ -33,18 +31,10 @@
DefaultStateHWSlowdownEventsThresholdFrequencyPerMinute = 0.6
)

func New(ctx context.Context, cfg nvidia_common.Config) components.Component {
func New(ctx context.Context, cfg nvidia_common.Config, eventsStore events_db.Store) components.Component {

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

View check run for this annotation

Codecov / codecov/patch

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

Added line #L34 was not covered by tests
cfg.Query.SetDefaultsIfNotSet()

cctx, ccancel := context.WithCancel(ctx)
nvidia_query.SetDefaultPoller(
nvidia_query.WithDBRW(cfg.Query.State.DBRW),
nvidia_query.WithDBRO(cfg.Query.State.DBRO),
nvidia_query.WithNvidiaSMICommand(cfg.NvidiaSMICommand),
nvidia_query.WithNvidiaSMIQueryCommand(cfg.NvidiaSMIQueryCommand),
nvidia_query.WithIbstatCommand(cfg.IbstatCommand),
nvidia_query.WithInfinibandClassDirectory(cfg.InfinibandClassDirectory),
)
nvidia_query.GetDefaultPoller().Start(cctx, cfg.Query, nvidia_hw_slowdown_id.Name)

return &component{
Expand All @@ -55,21 +45,7 @@
cancel: ccancel,
poller: nvidia_query.GetDefaultPoller(),

readEvents: func(ctx context.Context, since time.Time) ([]nvidia_hw_slowdown_state.Event, error) {
// the default nvidia poller persists the events to the storage
// so we can just read from the storage
return nvidia_hw_slowdown_state.ReadEvents(
ctx,
cfg.Query.State.DBRO,

nvidia_hw_slowdown_state.WithSince(since),

// in order to dedup nvidia-smi events and prioritize nvml events
// otherwise, we have deduplicate objects from nvml and nvidia-smi
// deprecate this once we removed nvidia-smi dependency
nvidia_hw_slowdown_state.WithDedupDataSource(true),
)
},
eventsStore: eventsStore,

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

View check run for this annotation

Codecov / codecov/patch

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

Added line #L48 was not covered by tests
}
}

Expand All @@ -84,7 +60,7 @@
poller query.Poller
gatherer prometheus.Gatherer

readEvents func(ctx context.Context, since time.Time) ([]nvidia_hw_slowdown_state.Event, error)
eventsStore events_db.Store
}

func (c *component) Name() string { return nvidia_hw_slowdown_id.Name }
Expand All @@ -108,7 +84,7 @@

since := time.Now().UTC().Add(-c.stateHWSlowdownEvaluationWindow)

events, err := c.readEvents(ctx, since)
events, err := c.eventsStore.Get(ctx, since)
if err != nil {
return nil, err
}
Expand All @@ -125,7 +101,7 @@

eventsByMinute := make(map[int]struct{})
for _, event := range events {
min := int(event.Timestamp / 60) // unix seconds to minutes
min := int(event.Time.Unix() / 60) // unix seconds to minutes
eventsByMinute[min] = struct{}{}
}

Expand Down Expand Up @@ -167,30 +143,7 @@
)

func (c *component) Events(ctx context.Context, since time.Time) ([]components.Event, error) {
events, err := c.readEvents(ctx, since)
if err != nil {
return nil, err
}

if len(events) == 0 {
log.Logger.Debugw("no event found for /events", "component", c.Name(), "since", humanize.Time(since))
return nil, nil
}

log.Logger.Debugw("found events", "component", c.Name(), "since", humanize.Time(since), "count", len(events))
convertedEvents := make([]components.Event, 0, len(events))
for _, event := range events {
convertedEvents = append(convertedEvents, components.Event{
Time: metav1.Time{Time: time.Unix(event.Timestamp, 0).UTC()},
Name: EventNameHWSlowdown,
Type: common.EventTypeWarning,
Message: strings.Join(event.Reasons, ", "),
ExtraInfo: map[string]string{
EventKeyGPUUUID: event.GPUUUID,
},
})
}
return convertedEvents, nil
return c.eventsStore.Get(ctx, since)

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

View check run for this annotation

Codecov / codecov/patch

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

Added line #L146 was not covered by tests
}

func (c *component) Metrics(ctx context.Context, since time.Time) ([]components.Metric, error) {
Expand Down
Loading
Loading