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

Jump to bottom

cl2: Scrape block profiles instead of mutex ones #2215

Merged
merged 1 commit into from
Dec 14, 2022
Merged

cl2: Scrape block profiles instead of mutex ones #2215

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
64 changes: 32 additions & 32 deletions clusterloader2/pkg/measurement/common/bundle/test_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,35 +57,35 @@ func createTestMetricsMeasurement() measurement.Measurement {
if metrics.etcdMemoryProfile, err = measurement.CreateMeasurement("MemoryProfile"); err != nil {
klog.Errorf("%v: etcdMemoryProfile creation error: %v", metrics, err)
}
if metrics.etcdMutexProfile, err = measurement.CreateMeasurement("MutexProfile"); err != nil {
klog.Errorf("%v: etcdMutexProfile creation error: %v", metrics, err)
if metrics.etcdBlockProfile, err = measurement.CreateMeasurement("BlockProfile"); err != nil {
klog.Errorf("%v: etcdBlockProfile creation error: %v", metrics, err)
}
if metrics.apiserverCPUProfile, err = measurement.CreateMeasurement("CPUProfile"); err != nil {
klog.Errorf("%v: apiserverCPUProfile creation error: %v", metrics, err)
}
if metrics.apiserverMemoryProfile, err = measurement.CreateMeasurement("MemoryProfile"); err != nil {
klog.Errorf("%v: apiserverMemoryProfile creation error: %v", metrics, err)
}
if metrics.apiserverMutexProfile, err = measurement.CreateMeasurement("MutexProfile"); err != nil {
klog.Errorf("%v: apiserverMutexProfile creation error: %v", metrics, err)
if metrics.apiserverBlockProfile, err = measurement.CreateMeasurement("BlockProfile"); err != nil {
klog.Errorf("%v: apiserverBlockProfile creation error: %v", metrics, err)
}
if metrics.schedulerCPUProfile, err = measurement.CreateMeasurement("CPUProfile"); err != nil {
klog.Errorf("%v: schedulerCPUProfile creation error: %v", metrics, err)
}
if metrics.schedulerMemoryProfile, err = measurement.CreateMeasurement("MemoryProfile"); err != nil {
klog.Errorf("%v: schedulerMemoryProfile creation error: %v", metrics, err)
}
if metrics.schedulerMutexProfile, err = measurement.CreateMeasurement("MutexProfile"); err != nil {
klog.Errorf("%v: schedulerMutexProfile creation error: %v", metrics, err)
if metrics.schedulerBlockProfile, err = measurement.CreateMeasurement("BlockProfile"); err != nil {
klog.Errorf("%v: schedulerBlockProfile creation error: %v", metrics, err)
}
if metrics.controllerManagerCPUProfile, err = measurement.CreateMeasurement("CPUProfile"); err != nil {
klog.Errorf("%v: controllerManagerCPUProfile creation error: %v", metrics, err)
}
if metrics.controllerManagerMemoryProfile, err = measurement.CreateMeasurement("MemoryProfile"); err != nil {
klog.Errorf("%v: controllerManagerMemoryProfile creation error: %v", metrics, err)
}
if metrics.controllerManagerMutexProfile, err = measurement.CreateMeasurement("MutexProfile"); err != nil {
klog.Errorf("%v: controllerManagerMutexProfile creation error: %v", metrics, err)
if metrics.controllerManagerBlockProfile, err = measurement.CreateMeasurement("BlockProfile"); err != nil {
klog.Errorf("%v: controllerManagerBlockProfile creation error: %v", metrics, err)
}
if metrics.systemPodMetrics, err = measurement.CreateMeasurement("SystemPodMetrics"); err != nil {
klog.Errorf("%v: systemPodMetrics creation error: %v", metrics, err)
Expand All @@ -103,16 +103,16 @@ type testMetrics struct {
resourceUsageSummary measurement.Measurement
etcdCPUProfile measurement.Measurement
etcdMemoryProfile measurement.Measurement
etcdMutexProfile measurement.Measurement
etcdBlockProfile measurement.Measurement
apiserverCPUProfile measurement.Measurement
apiserverMemoryProfile measurement.Measurement
apiserverMutexProfile measurement.Measurement
apiserverBlockProfile measurement.Measurement
schedulerCPUProfile measurement.Measurement
schedulerMemoryProfile measurement.Measurement
schedulerMutexProfile measurement.Measurement
schedulerBlockProfile measurement.Measurement
controllerManagerCPUProfile measurement.Measurement
controllerManagerMemoryProfile measurement.Measurement
controllerManagerMutexProfile measurement.Measurement
controllerManagerBlockProfile measurement.Measurement
systemPodMetrics measurement.Measurement
clusterOOMsTracker measurement.Measurement
}
Expand Down Expand Up @@ -181,26 +181,26 @@ func (t *testMetrics) Execute(config *measurement.Config) ([]measurement.Summary
appendResults(&summaries, errList, summary, executeError(t.etcdCPUProfile.String(), action, err))
summary, err = execute(t.etcdMemoryProfile, etcdStartConfig)
appendResults(&summaries, errList, summary, executeError(t.etcdMemoryProfile.String(), action, err))
summary, err = execute(t.etcdMutexProfile, etcdStartConfig)
appendResults(&summaries, errList, summary, executeError(t.etcdMutexProfile.String(), action, err))
summary, err = execute(t.etcdBlockProfile, etcdStartConfig)
appendResults(&summaries, errList, summary, executeError(t.etcdBlockProfile.String(), action, err))
summary, err = execute(t.apiserverCPUProfile, kubeApiserverStartConfig)
appendResults(&summaries, errList, summary, executeError(t.apiserverCPUProfile.String(), action, err))
summary, err = execute(t.apiserverMemoryProfile, kubeApiserverStartConfig)
appendResults(&summaries, errList, summary, executeError(t.apiserverMemoryProfile.String(), action, err))
summary, err = execute(t.apiserverMutexProfile, kubeApiserverStartConfig)
appendResults(&summaries, errList, summary, executeError(t.apiserverMutexProfile.String(), action, err))
summary, err = execute(t.apiserverBlockProfile, kubeApiserverStartConfig)
appendResults(&summaries, errList, summary, executeError(t.apiserverBlockProfile.String(), action, err))
summary, err = execute(t.schedulerCPUProfile, kubeSchedulerStartConfig)
appendResults(&summaries, errList, summary, executeError(t.schedulerCPUProfile.String(), action, err))
summary, err = execute(t.schedulerMemoryProfile, kubeSchedulerStartConfig)
appendResults(&summaries, errList, summary, executeError(t.schedulerMemoryProfile.String(), action, err))
summary, err = execute(t.schedulerMutexProfile, kubeSchedulerStartConfig)
appendResults(&summaries, errList, summary, executeError(t.schedulerMutexProfile.String(), action, err))
summary, err = execute(t.schedulerBlockProfile, kubeSchedulerStartConfig)
appendResults(&summaries, errList, summary, executeError(t.schedulerBlockProfile.String(), action, err))
summary, err = execute(t.controllerManagerCPUProfile, kubeControllerManagerStartConfig)
appendResults(&summaries, errList, summary, executeError(t.controllerManagerCPUProfile.String(), action, err))
summary, err = execute(t.controllerManagerMemoryProfile, kubeControllerManagerStartConfig)
appendResults(&summaries, errList, summary, executeError(t.controllerManagerMemoryProfile.String(), action, err))
summary, err = execute(t.controllerManagerMutexProfile, kubeControllerManagerStartConfig)
appendResults(&summaries, errList, summary, executeError(t.controllerManagerMutexProfile.String(), action, err))
summary, err = execute(t.controllerManagerBlockProfile, kubeControllerManagerStartConfig)
appendResults(&summaries, errList, summary, executeError(t.controllerManagerBlockProfile.String(), action, err))
summary, err = execute(t.systemPodMetrics, config)
appendResults(&summaries, errList, summary, executeError(t.systemPodMetrics.String(), action, err))
summary, err = execute(t.clusterOOMsTracker, config)
Expand All @@ -218,26 +218,26 @@ func (t *testMetrics) Execute(config *measurement.Config) ([]measurement.Summary
appendResults(&summaries, errList, summary, executeError(t.etcdCPUProfile.String(), action, err))
summary, err = execute(t.etcdMemoryProfile, etcdGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.etcdMemoryProfile.String(), action, err))
summary, err = execute(t.etcdMutexProfile, etcdGatherConfig)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For Etcd I can see that mutex profiles are actually working, check https://gcsweb.k8s.io/gcs/kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-scale-performance/1602710237461090304/artifacts/

Copy link
Contributor Author

@MadhavJivrajani MadhavJivrajani Dec 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah etcd actually enables both block and mutex:
https://github.com/etcd-io/etcd/blob/8e3fc380dcaf44c37bb5dc19f1832981225061cc/pkg/debugutil/pprof.go#L28 and https://github.com/etcd-io/etcd/blob/8e3fc380dcaf44c37bb5dc19f1832981225061cc/pkg/debugutil/pprof.go#L43

I think we may have to introduce a new type called BlockProfile, enable that for all control plane components and then use MutexProfile only for etcd if we want etcd mutex profiles

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, sounds good.

appendResults(&summaries, errList, summary, executeError(t.etcdMutexProfile.String(), action, err))
summary, err = execute(t.etcdBlockProfile, etcdGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.etcdBlockProfile.String(), action, err))
summary, err = execute(t.apiserverCPUProfile, kubeApiserverGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.apiserverCPUProfile.String(), action, err))
summary, err = execute(t.apiserverMemoryProfile, kubeApiserverGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.apiserverMemoryProfile.String(), action, err))
summary, err = execute(t.apiserverMutexProfile, kubeApiserverGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.apiserverMutexProfile.String(), action, err))
summary, err = execute(t.apiserverBlockProfile, kubeApiserverGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.apiserverBlockProfile.String(), action, err))
summary, err = execute(t.schedulerCPUProfile, kubeSchedulerGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.schedulerCPUProfile.String(), action, err))
summary, err = execute(t.schedulerMemoryProfile, kubeSchedulerGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.schedulerMemoryProfile.String(), action, err))
summary, err = execute(t.schedulerMutexProfile, kubeSchedulerGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.schedulerMutexProfile.String(), action, err))
summary, err = execute(t.schedulerBlockProfile, kubeSchedulerGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.schedulerBlockProfile.String(), action, err))
summary, err = execute(t.controllerManagerCPUProfile, kubeControllerManagerGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.controllerManagerCPUProfile.String(), action, err))
summary, err = execute(t.controllerManagerMemoryProfile, kubeControllerManagerGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.controllerManagerMemoryProfile.String(), action, err))
summary, err = execute(t.controllerManagerMutexProfile, kubeControllerManagerGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.controllerManagerMutexProfile.String(), action, err))
summary, err = execute(t.controllerManagerBlockProfile, kubeControllerManagerGatherConfig)
appendResults(&summaries, errList, summary, executeError(t.controllerManagerBlockProfile.String(), action, err))
summary, err = execute(t.systemPodMetrics, config)
appendResults(&summaries, errList, summary, executeError(t.systemPodMetrics.String(), action, err))
summary, err = execute(t.clusterOOMsTracker, config)
Expand All @@ -261,16 +261,16 @@ func (t *testMetrics) Dispose() {
t.resourceUsageSummary.Dispose()
t.etcdCPUProfile.Dispose()
t.etcdMemoryProfile.Dispose()
t.etcdMutexProfile.Dispose()
t.etcdBlockProfile.Dispose()
t.apiserverCPUProfile.Dispose()
t.apiserverMemoryProfile.Dispose()
t.apiserverMutexProfile.Dispose()
t.apiserverBlockProfile.Dispose()
t.schedulerCPUProfile.Dispose()
t.schedulerMemoryProfile.Dispose()
t.schedulerMutexProfile.Dispose()
t.schedulerBlockProfile.Dispose()
t.controllerManagerCPUProfile.Dispose()
t.controllerManagerMemoryProfile.Dispose()
t.controllerManagerMutexProfile.Dispose()
t.controllerManagerBlockProfile.Dispose()
}

// String returns a string representation of the measurement.
Expand Down
6 changes: 3 additions & 3 deletions clusterloader2/pkg/measurement/common/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
const (
cpuProfileName = "CPUProfile"
memoryProfileName = "MemoryProfile"
mutexProfileName = "MutexProfile"
blockProfileName = "BlockProfile"
)

func init() {
Expand All @@ -48,8 +48,8 @@ func init() {
if err := measurement.Register(memoryProfileName, createProfileMeasurementFactory(memoryProfileName, "heap")); err != nil {
klog.Fatalf("Cannot register %s: %v", memoryProfileName, err)
}
if err := measurement.Register(mutexProfileName, createProfileMeasurementFactory(mutexProfileName, "mutex")); err != nil {
klog.Fatalf("Cannot register %s: %v", mutexProfileName, err)
if err := measurement.Register(blockProfileName, createProfileMeasurementFactory(blockProfileName, "block")); err != nil {
klog.Fatalf("Cannot register %s: %v", blockProfileName, err)
}
}

Expand Down