mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-29 11:16:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

enable VGDP soothing by default and set queue length as 5 (#10578)

Browse Source 
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
This commit is contained in:
lyndon-li
2026-09-28 11:18:50 +08:00
committed by GitHub
parent 8e9f66addf
commit 1acecf8754
3 changed files with 158 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/cli/nodeagent/server.go
+18 -8
View File
@@ -78,6 +78,7 @@ const (
defaultResourceTimeout = 10 * time.Minute
defaultDataMoverPrepareTimeout = 30 * time.Minute
defaultDataPathConcurrentNum = 1
defaultPrepareQueueLength = 5
)
type nodeAgentServerConfig struct {
@@ -353,14 +354,7 @@ func (s *nodeAgentServer) run() {
}
}
if s.dataPathConfigs != nil && s.dataPathConfigs.LoadConcurrency != nil && s.dataPathConfigs.LoadConcurrency.PrepareQueueLength > 0 {
if counter, err := exposer.StartVgdpCounter(s.ctx, s.mgr, s.dataPathConfigs.LoadConcurrency.PrepareQueueLength); err != nil {
s.logger.WithError(err).Warnf("Failed to start VGDP counter, VDGP loads are not constrained")
} else {
s.vgdpCounter = counter
s.logger.Infof("VGDP loads are constrained with %d", s.dataPathConfigs.LoadConcurrency.PrepareQueueLength)
}
}
s.initVgdpCounter()
var cachePVCConfig *velerotypes.CachePVC
if s.dataPathConfigs != nil && s.dataPathConfigs.CachePVCConfig != nil {
@@ -728,3 +722,19 @@ func (s *nodeAgentServer) validateCachePVCConfig(config velerotypes.CachePVC) er
return nil
}
var startVgdpCounterFunc = exposer.StartVgdpCounter
func (s *nodeAgentServer) initVgdpCounter() {
prepareQueueLength := defaultPrepareQueueLength
if s.dataPathConfigs != nil && s.dataPathConfigs.LoadConcurrency != nil && s.dataPathConfigs.LoadConcurrency.PrepareQueueLength > 0 {
prepareQueueLength = s.dataPathConfigs.LoadConcurrency.PrepareQueueLength
}
if counter, err := startVgdpCounterFunc(s.ctx, s.mgr, prepareQueueLength); err != nil {
s.logger.WithError(err).Warnf("Failed to start VGDP counter with length %d, VDGP loads are not constrained", prepareQueueLength)
} else {
s.vgdpCounter = counter
s.logger.Infof("VGDP loads are constrained with %d", prepareQueueLength)
}
}
pkg/cmd/cli/nodeagent/server_test.go
+139
View File
@@ -30,8 +30,10 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/fake"
"sigs.k8s.io/controller-runtime/pkg/manager"
"github.com/vmware-tanzu/velero/pkg/builder"
"github.com/vmware-tanzu/velero/pkg/exposer"
"github.com/vmware-tanzu/velero/pkg/nodeagent"
testutil "github.com/vmware-tanzu/velero/pkg/test"
velerotypes "github.com/vmware-tanzu/velero/pkg/types"
@@ -530,3 +532,140 @@ func TestValidateCachePVCConfig(t *testing.T) {
})
}
}
func Test_initVgdpCounter(t *testing.T) {
origStartVgdpCounterFunc := startVgdpCounterFunc
defer func() {
startVgdpCounterFunc = origStartVgdpCounterFunc
}()
mockCounter := &exposer.VgdpCounter{}
tests := []struct {
name string
dataPathConfigs *velerotypes.NodeAgentConfigs
mockFunc func(ctx context.Context, mgr manager.Manager, queueLength int) (*exposer.VgdpCounter, error)
expectQueueLength int
expectVgdpCounterSet bool
expectLog string
}{
{
name: "default configs, startVgdpCounter succeeds",
dataPathConfigs: nil,
mockFunc: func(ctx context.Context, mgr manager.Manager, queueLength int) (*exposer.VgdpCounter, error) {
return mockCounter, nil
},
expectQueueLength: defaultPrepareQueueLength,
expectVgdpCounterSet: true,
expectLog: fmt.Sprintf("VGDP loads are constrained with %d", defaultPrepareQueueLength),
},
{
name: "custom queue length, startVgdpCounter succeeds",
dataPathConfigs: &velerotypes.NodeAgentConfigs{
LoadConcurrency: &velerotypes.LoadConcurrency{
PrepareQueueLength: 10,
},
},
mockFunc: func(ctx context.Context, mgr manager.Manager, queueLength int) (*exposer.VgdpCounter, error) {
return mockCounter, nil
},
expectQueueLength: 10,
expectVgdpCounterSet: true,
expectLog: "VGDP loads are constrained with 10",
},
{
name: "LoadConcurrency is nil, uses default queue length",
dataPathConfigs: &velerotypes.NodeAgentConfigs{
LoadConcurrency: nil,
},
mockFunc: func(ctx context.Context, mgr manager.Manager, queueLength int) (*exposer.VgdpCounter, error) {
return mockCounter, nil
},
expectQueueLength: defaultPrepareQueueLength,
expectVgdpCounterSet: true,
expectLog: fmt.Sprintf("VGDP loads are constrained with %d", defaultPrepareQueueLength),
},
{
name: "PrepareQueueLength is 0, uses default queue length",
dataPathConfigs: &velerotypes.NodeAgentConfigs{
LoadConcurrency: &velerotypes.LoadConcurrency{
PrepareQueueLength: 0,
},
},
mockFunc: func(ctx context.Context, mgr manager.Manager, queueLength int) (*exposer.VgdpCounter, error) {
return mockCounter, nil
},
expectQueueLength: defaultPrepareQueueLength,
expectVgdpCounterSet: true,
expectLog: fmt.Sprintf("VGDP loads are constrained with %d", defaultPrepareQueueLength),
},
{
name: "PrepareQueueLength is negative, uses default queue length",
dataPathConfigs: &velerotypes.NodeAgentConfigs{
LoadConcurrency: &velerotypes.LoadConcurrency{
PrepareQueueLength: -1,
},
},
mockFunc: func(ctx context.Context, mgr manager.Manager, queueLength int) (*exposer.VgdpCounter, error) {
return mockCounter, nil
},
expectQueueLength: defaultPrepareQueueLength,
expectVgdpCounterSet: true,
expectLog: fmt.Sprintf("VGDP loads are constrained with %d", defaultPrepareQueueLength),
},
{
name: "startVgdpCounter fails with default queue length",
dataPathConfigs: nil,
mockFunc: func(ctx context.Context, mgr manager.Manager, queueLength int) (*exposer.VgdpCounter, error) {
return nil, errors.New("fake-start-error")
},
expectQueueLength: defaultPrepareQueueLength,
expectVgdpCounterSet: false,
expectLog: fmt.Sprintf("Failed to start VGDP counter with length %d, VDGP loads are not constrained", defaultPrepareQueueLength),
},
{
name: "startVgdpCounter fails with custom queue length",
dataPathConfigs: &velerotypes.NodeAgentConfigs{
LoadConcurrency: &velerotypes.LoadConcurrency{
PrepareQueueLength: 8,
},
},
mockFunc: func(ctx context.Context, mgr manager.Manager, queueLength int) (*exposer.VgdpCounter, error) {
return nil, errors.New("fake-start-error")
},
expectQueueLength: 8,
expectVgdpCounterSet: false,
expectLog: "Failed to start VGDP counter with length 8, VDGP loads are not constrained",
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
var recordedQueueLength int
startVgdpCounterFunc = func(ctx context.Context, mgr manager.Manager, queueLength int) (*exposer.VgdpCounter, error) {
recordedQueueLength = queueLength
return test.mockFunc(ctx, mgr, queueLength)
}
logBuffer := ""
s := &nodeAgentServer{
ctx: t.Context(),
dataPathConfigs: test.dataPathConfigs,
logger: testutil.NewSingleLogger(&logBuffer),
}
s.initVgdpCounter()
assert.Equal(t, test.expectQueueLength, recordedQueueLength)
if test.expectVgdpCounterSet {
assert.Equal(t, mockCounter, s.vgdpCounter)
} else {
assert.Nil(t, s.vgdpCounter)
}
if test.expectLog != "" {
assert.Contains(t, logBuffer, test.expectLog)
}
})
}
}