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

refine the implementation for qos configurations #444

Merged
merged 1 commit into from
Jan 16, 2024
Merged

refine the implementation for qos configurations #444

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion cmd/base/options/qos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (o *QoSOptions) applyToExpandQoSEnhancement(c *generic.QoSConfiguration, po
enhancementMap[strings.TrimSpace(sList[0])] = strings.TrimSpace(sList[1])
}

c.SetExpandQoSEnhancementSelector(enhancementMap)
c.SetExpandQoSEnhancementKey(enhancementMap)
return nil
}

Expand Down
7 changes: 3 additions & 4 deletions pkg/agent/qrm-plugins/cpu/dynamicpolicy/policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,13 @@ import (
"testing"
"time"

"github.com/stretchr/testify/require"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/uuid"
pluginapi "k8s.io/kubelet/pkg/apis/resourceplugin/v1alpha1"
utilfs "k8s.io/kubernetes/pkg/util/filesystem"

"github.com/stretchr/testify/require"

"github.com/kubewharf/katalyst-api/pkg/consts"
cpuconsts "github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/cpu/consts"
"github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/cpu/dynamicpolicy/calculator"
Expand Down Expand Up @@ -679,7 +678,7 @@ func TestAllocate(t *testing.T) {
as.Nil(err)

if tc.enhancementDefaultValues != nil {
dynamicPolicy.qosConfig.EnhancementDefaultValues = tc.enhancementDefaultValues
dynamicPolicy.qosConfig.QoSEnhancementDefaultValues = tc.enhancementDefaultValues
}

resp, err := dynamicPolicy.Allocate(context.Background(), tc.req)
Expand Down Expand Up @@ -1095,7 +1094,7 @@ func TestGetTopologyHints(t *testing.T) {
as.Nil(err)

if tc.enhancementDefaultValues != nil {
dynamicPolicy.qosConfig.EnhancementDefaultValues = tc.enhancementDefaultValues
dynamicPolicy.qosConfig.QoSEnhancementDefaultValues = tc.enhancementDefaultValues
}

resp, err := dynamicPolicy.GetTopologyHints(context.Background(), tc.req)
Expand Down
1 change: 0 additions & 1 deletion pkg/agent/qrm-plugins/memory/dynamicpolicy/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (

apiconsts "github.com/kubewharf/katalyst-api/pkg/consts"
"github.com/kubewharf/katalyst-api/pkg/plugins/skeleton"

"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/agent"
"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/agent/qrm"
"github.com/kubewharf/katalyst-core/pkg/agent/qrm-plugins/advisorsvc"
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/qrm-plugins/memory/dynamicpolicy/policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ func TestAllocate(t *testing.T) {
as.Nil(err)

if tc.enhancementDefaultValues != nil {
dynamicPolicy.qosConfig.EnhancementDefaultValues = tc.enhancementDefaultValues
dynamicPolicy.qosConfig.QoSEnhancementDefaultValues = tc.enhancementDefaultValues
}

dynamicPolicy.enableMemoryAdvisor = true
Expand Down Expand Up @@ -1238,7 +1238,7 @@ func TestGetTopologyHints(t *testing.T) {
as.Nil(err)

if tc.enhancementDefaultValues != nil {
dynamicPolicy.qosConfig.EnhancementDefaultValues = tc.enhancementDefaultValues
dynamicPolicy.qosConfig.QoSEnhancementDefaultValues = tc.enhancementDefaultValues
}

resp, err := dynamicPolicy.GetTopologyHints(context.Background(), tc.req)
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/qrm-plugins/network/staticpolicy/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@ func (p *StaticPolicy) getNetClassID(podAnnotations map[string]string, podLevelN
return classID, nil
}

qosLevel, err := p.qosConfig.GetQoSLevel(podAnnotations)
qosLevel, err := p.qosConfig.GetQoSLevel(nil, podAnnotations)
if err != nil {
return 0, err
}
Expand Down
9 changes: 2 additions & 7 deletions pkg/agent/qrm-plugins/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func GetKatalystQoSLevelFromResourceReq(qosConf *generic.QoSConfiguration, req *
}

var getErr error
qosLevel, getErr = qosConf.GetQoSLevel(req.Annotations)
qosLevel, getErr = qosConf.GetQoSLevel(nil, req.Annotations)
if getErr != nil {
err = fmt.Errorf("resource type mismatches: %v", getErr)
return
Expand All @@ -91,12 +91,7 @@ func GetKatalystQoSLevelFromResourceReq(qosConf *generic.QoSConfiguration, req *
req.Annotations = make(map[string]string)
}
req.Annotations[apiconsts.PodAnnotationQoSLevelKey] = qosLevel
parsedAnnotations, err := qosConf.FilterQoSAndEnhancement(req.Annotations)
if err != nil {
err = fmt.Errorf("ParseKatalystAnnotations failed with error: %v", err)
return
}
req.Annotations = parsedAnnotations
req.Annotations = qosConf.FilterQoSAndEnhancementMap(req.Annotations)

if req.Labels == nil {
req.Labels = make(map[string]string)
Expand Down
3 changes: 1 addition & 2 deletions pkg/agent/sysadvisor/plugin/inference/modelresultfetcher/borwein/borwein_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"testing"
"time"

"github.com/stretchr/testify/require"
"google.golang.org/grpc"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -36,8 +37,6 @@ import (
"k8s.io/client-go/kubernetes/fake"
"k8s.io/kubelet/pkg/apis/resourceplugin/v1alpha1"

"github.com/stretchr/testify/require"

internalfake "github.com/kubewharf/katalyst-api/pkg/client/clientset/versioned/fake"
"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/options"
"github.com/kubewharf/katalyst-core/pkg/agent/sysadvisor/metacache"
Expand Down
Loading