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

enhancement(eviction): heartbeat in cpu pressure eviction plugin #184

Merged
merged 1 commit into from
Aug 4, 2023
Merged

enhancement(eviction): heartbeat in cpu pressure eviction plugin #184

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
10 changes: 10 additions & 0 deletions pkg/agent/qrm-plugins/cpu/dynamicpolicy/cpueviction/cpu_eviciton.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,18 @@ import (
"context"
"fmt"
"sync"
"time"

v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"

"github.com/kubewharf/katalyst-api/pkg/plugins/skeleton"
pluginapi "github.com/kubewharf/katalyst-api/pkg/protocol/evictionplugin/v1alpha1"
"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/agent"
"github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/cpu/dynamicpolicy/cpueviction/strategy"
"github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/cpu/dynamicpolicy/state"
"github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/util"
"github.com/kubewharf/katalyst-core/pkg/config"
"github.com/kubewharf/katalyst-core/pkg/metaserver"
"github.com/kubewharf/katalyst-core/pkg/metrics"
Expand All @@ -47,6 +50,8 @@ type cpuPressureEviction struct {
// the order in those list also indicates the priority of those eviction strategies
forceEvictionList []strategy.CPUPressureForceEviction
thresholdEvictionList []strategy.CPUPressureThresholdEviction

emitter metrics.MetricEmitter
}

func NewCPUPressureEviction(emitter metrics.MetricEmitter, metaServer *metaserver.MetaServer,
Expand Down Expand Up @@ -75,6 +80,7 @@ func newCPUPressureEviction(emitter metrics.MetricEmitter, metaServer *metaserve
thresholdEvictionList: []strategy.CPUPressureThresholdEviction{
pressureLoadEviction,
},
emitter: wrappedEmitter,
}

return skeleton.NewRegistrationPluginWrapper(plugin, []string{conf.PluginRegistrationDir},
Expand Down Expand Up @@ -112,6 +118,10 @@ func (p *cpuPressureEviction) Start() (err error) {
return fmt.Errorf("start %v failed: %v", s.Name(), startErr)
}
}

go wait.Until(func() {
_ = p.emitter.StoreInt64(util.MetricNameHeartBeat, 1, metrics.MetricTypeNameRaw)
}, time.Second*30, p.ctx.Done())
return
}

Expand Down