Merge pull request #747 from gary-lgy/qrm-sync

feat(qrm-plugins): synchronous GetAdvice API between qrm-plugins and sys-advisor

Author: gary-lgy

Makefile

@@ -77,8 +77,12 @@ generate-sys-advisor-cpu-plugin:
 AdvisorSvcPath = $(MakeFilePath)/pkg/agent/qrm-plugins/advisorsvc/
 .PHONY: generate-advisor-svc ## Generate protocol for general qrm-plugin with sys-advisor
 generate-advisor-svc:
+	mkdir -p $(TempRepoDir)/github.com/kubewharf && \
+	mkdir -p $(TempRepoDir)/github.com/gogo && \
+	git clone https://github.com/kubewharf/kubelet.git $(TempRepoDir)/github.com/kubewharf/kubelet && \
+	git clone https://github.com/gogo/protobuf.git $(TempRepoDir)/github.com/gogo/protobuf && \
 	targetTag=`cat $(MakeFilePath)/go.mod | grep kubewharf/kubelet | awk '{print $$4}'` && \
-        cd $(GOPATH)/src/github.com/kubewharf/kubelet && \
+        cd $(TempRepoDir)/github.com/kubewharf/kubelet && \
 		git fetch --tags && \
 		git checkout $$targetTag && \
 		cd - && \

cmd/katalyst-agent/app/options/qrm/cpu_plugin.go

@@ -17,6 +17,8 @@ limitations under the License.
 package qrm
 
 import (
+	"time"
+
 	cliflag "k8s.io/component-base/cli/flag"
 
 	"github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/commonstate"
@@ -35,6 +37,7 @@ type CPUOptions struct {
 
 type CPUDynamicPolicyOptions struct {
 	EnableCPUAdvisor              bool
+	AdvisorGetAdviceInterval      time.Duration
 	EnableCPUPressureEviction     bool
 	LoadPressureEvictionSkipPools []string
 	EnableSyncingCPUIdle          bool
@@ -55,6 +58,7 @@ func NewCPUOptions() *CPUOptions {
 		SkipCPUStateCorruption: false,
 		CPUDynamicPolicyOptions: CPUDynamicPolicyOptions{
 			EnableCPUAdvisor:          false,
+			AdvisorGetAdviceInterval:  5 * time.Second,
 			EnableCPUPressureEviction: false,
 			EnableSyncingCPUIdle:      false,
 			EnableCPUIdle:             false,
@@ -80,6 +84,8 @@ func (o *CPUOptions) AddFlags(fss *cliflag.NamedFlagSets) {
 		o.PolicyName, "The policy cpu resource plugin should use")
 	fs.BoolVar(&o.EnableCPUAdvisor, "cpu-resource-plugin-advisor",
 		o.EnableCPUAdvisor, "Whether cpu resource plugin should enable sys-advisor")
+	fs.DurationVar(&o.AdvisorGetAdviceInterval, "cpu-resource-plugin-advisor-interval",
+		o.AdvisorGetAdviceInterval, "If cpu advisor is enabled, this is the interval at which we get advice from sys-advisor")
 	fs.IntVar(&o.ReservedCPUCores, "cpu-resource-plugin-reserved",
 		o.ReservedCPUCores, "The total cores cpu resource plugin should reserve")
 	fs.BoolVar(&o.SkipCPUStateCorruption, "skip-cpu-state-corruption",
@@ -108,6 +114,7 @@ func (o *CPUOptions) AddFlags(fss *cliflag.NamedFlagSets) {
 func (o *CPUOptions) ApplyTo(conf *qrmconfig.CPUQRMPluginConfig) error {
 	conf.PolicyName = o.PolicyName
 	conf.EnableCPUAdvisor = o.EnableCPUAdvisor
+	conf.GetAdviceInterval = o.AdvisorGetAdviceInterval
 	conf.ReservedCPUCores = o.ReservedCPUCores
 	conf.SkipCPUStateCorruption = o.SkipCPUStateCorruption
 	conf.EnableCPUPressureEviction = o.EnableCPUPressureEviction

cmd/katalyst-agent/app/options/qrm/memory_plugin.go

@@ -31,6 +31,7 @@ type MemoryOptions struct {
 	SkipMemoryStateCorruption                     bool
 	EnableSettingMemoryMigrate                    bool
 	EnableMemoryAdvisor                           bool
+	AdvisorGetAdviceInterval                      time.Duration
 	ExtraControlKnobConfigFile                    string
 	EnableOOMPriority                             bool
 	OOMPriorityPinnedMapAbsPath                   string
@@ -77,12 +78,13 @@ type FragMemOptions struct {
 
 func NewMemoryOptions() *MemoryOptions {
 	return &MemoryOptions{
-		PolicyName:                 "dynamic",
-		ReservedMemoryGB:           0,
-		SkipMemoryStateCorruption:  false,
-		EnableSettingMemoryMigrate: false,
-		EnableMemoryAdvisor:        false,
-		EnableOOMPriority:          false,
+		PolicyName:                                    "dynamic",
+		ReservedMemoryGB:                              0,
+		SkipMemoryStateCorruption:                     false,
+		EnableSettingMemoryMigrate:                    false,
+		EnableMemoryAdvisor:                           false,
+		AdvisorGetAdviceInterval:                      5 * time.Second,
+		EnableOOMPriority:                             false,
 		EnableNonBindingShareCoresMemoryResourceCheck: true,
 		EnableNUMAAllocationReactor:                   false,
 		NUMABindResultResourceAllocationAnnotationKey: consts.QRMResourceAnnotationKeyNUMABindResult,
@@ -120,6 +122,8 @@ func (o *MemoryOptions) AddFlags(fss *cliflag.NamedFlagSets) {
 		o.EnableSettingMemoryMigrate, "if set true, we will enable cpuset.memory_migrate for containers not numa_binding")
 	fs.BoolVar(&o.EnableMemoryAdvisor, "memory-resource-plugin-advisor",
 		o.EnableMemoryAdvisor, "Whether memory resource plugin should enable sys-advisor")
+	fs.DurationVar(&o.AdvisorGetAdviceInterval, "memory-resource-plugin-advisor-interval",
+		o.AdvisorGetAdviceInterval, "If memory advisor is enabled, this is the interval at which we get advice from sys-advisor")
 	fs.StringVar(&o.ExtraControlKnobConfigFile, "memory-extra-control-knob-config-file",
 		o.ExtraControlKnobConfigFile, "the absolute path of extra control knob config file")
 	fs.BoolVar(&o.EnableOOMPriority, "enable-oom-priority",
@@ -164,6 +168,7 @@ func (o *MemoryOptions) ApplyTo(conf *qrmconfig.MemoryQRMPluginConfig) error {
 	conf.SkipMemoryStateCorruption = o.SkipMemoryStateCorruption
 	conf.EnableSettingMemoryMigrate = o.EnableSettingMemoryMigrate
 	conf.EnableMemoryAdvisor = o.EnableMemoryAdvisor
+	conf.GetAdviceInterval = o.AdvisorGetAdviceInterval
 	conf.ExtraControlKnobConfigFile = o.ExtraControlKnobConfigFile
 	conf.EnableOOMPriority = o.EnableOOMPriority
 	conf.EnableNonBindingShareCoresMemoryResourceCheck = o.EnableNonBindingShareCoresMemoryResourceCheck

codecov.yml

@@ -26,6 +26,7 @@ coverage:
 
 ignore:
   - "**/*_generated.*"
+  - "**/*.pb.go"
   - "pkg/config/**/*.*"
 
 github_checks: