github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

scheduler_perf: run with -v=0 by default

Browse Source 
This provides a mechanism for overriding the forced increase of the klog
verbosity to 4 when starting the apiserver and uses that for the scheduler_perf
benchmark. Other tests run as before.

A global variable was used because adding an explicit parameter to several
helper functions would have caused a lot of code churn (test ->
integration/util.StartApiserver ->
integration/framework.RunAnAPIServerUsingServer ->
integration/framework.startAPIServerOrDie).
This commit is contained in:
Patrick Ohly 2022-02-07 09:12:10 +01:00
parent c62d7407c8
commit e1e84c8e5f
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/framework/controlplane_utils.go
View File

@ -65,6 +65,13 @@ const (
UnprivilegedUserToken = "unprivileged-user" UnprivilegedUserToken = "unprivileged-user"
) )
// MinVerbosity determines the minimum klog verbosity when running tests that
// involve the apiserver. This overrides the -v value from the command line,
// i.e. -v=0 has no effect when MinVerbosity is 4 (the default). Tests can opt
// out of this by setting MinVerbosity to zero before starting the control
// plane or choose some different minimum verbosity.
var MinVerbosity = 4
// Config is a struct of configuration directives for NewControlPlaneComponents. // Config is a struct of configuration directives for NewControlPlaneComponents.
type Config struct { type Config struct {
// If nil, a default is used, partially filled configs will not get populated. // If nil, a default is used, partially filled configs will not get populated.
@ -139,11 +146,11 @@ func startAPIServerOrDie(controlPlaneConfig *controlplane.Config, incomingServer
var m *controlplane.Instance var m *controlplane.Instance
var s *httptest.Server var s *httptest.Server
// Ensure we log at least level 4 // Ensure we log at least at the desired level
v := flag.Lookup("v").Value v := flag.Lookup("v").Value
level, _ := strconv.Atoi(v.String()) level, _ := strconv.Atoi(v.String())
if level < 4 { if level < MinVerbosity {
v.Set("4") v.Set(strconv.Itoa(MinVerbosity))
} }
if incomingServer != nil { if incomingServer != nil {

3
test/integration/scheduler_perf/util.go
View File

@ -44,6 +44,7 @@ import (
"k8s.io/kube-scheduler/config/v1beta2" "k8s.io/kube-scheduler/config/v1beta2"
"k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config"
kubeschedulerscheme "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme" kubeschedulerscheme "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
"k8s.io/kubernetes/test/integration/framework"
"k8s.io/kubernetes/test/integration/util" "k8s.io/kubernetes/test/integration/util"
testutils "k8s.io/kubernetes/test/utils" testutils "k8s.io/kubernetes/test/utils"
) )
@ -75,6 +76,8 @@ func newDefaultComponentConfig() (*config.KubeSchedulerConfiguration, error) {
// Notes on rate limiter: // Notes on rate limiter:
// - client rate limit is set to 5000. // - client rate limit is set to 5000.
func mustSetupScheduler(config *config.KubeSchedulerConfiguration) (util.ShutdownFunc, coreinformers.PodInformer, clientset.Interface, dynamic.Interface) { func mustSetupScheduler(config *config.KubeSchedulerConfiguration) (util.ShutdownFunc, coreinformers.PodInformer, clientset.Interface, dynamic.Interface) {
// Run API server with minimimal logging by default. Can be raised with -v.
framework.MinVerbosity = 0
apiURL, apiShutdown := util.StartApiserver() apiURL, apiShutdown := util.StartApiserver()
var err error var err error