Merge pull request kubernetes-sigs#8934 from sbueringer/pr-enable-block-profiling

🌱 all: Add flags to enable block profiling

Author: k8s-ci-robot

bootstrap/kubeadm/main.go

@@ -23,6 +23,7 @@ import (
 	"fmt"
 	_ "net/http/pprof"
 	"os"
+	goruntime "runtime"
 	"time"
 
 	// +kubebuilder:scaffold:imports
@@ -81,6 +82,7 @@ var (
 	watchFilterValue            string
 	watchNamespace              string
 	profilerAddress             string
+	enableContentionProfiling   bool
 	clusterConcurrency          int
 	kubeadmConfigConcurrency    int
 	syncPeriod                  time.Duration
@@ -119,6 +121,9 @@ func InitFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&profilerAddress, "profiler-address", "",
 		"Bind address to expose the pprof profiler (e.g. localhost:6060)")
 
+	fs.BoolVar(&enableContentionProfiling, "contention-profiling", false,
+		"Enable block profiling, if profiler-address is set.")
+
 	fs.IntVar(&clusterConcurrency, "cluster-concurrency", 10,
 		"Number of clusters to process simultaneously")
 
@@ -184,6 +189,10 @@ func main() {
 		watchNamespaces = []string{watchNamespace}
 	}
 
+	if profilerAddress != "" && enableContentionProfiling {
+		goruntime.SetBlockProfileRate(1)
+	}
+
 	ctrlOptions := ctrl.Options{
 		Scheme:                     scheme,
 		MetricsBindAddress:         metricsBindAddr,

controlplane/kubeadm/main.go

@@ -23,6 +23,7 @@ import (
 	"fmt"
 	_ "net/http/pprof"
 	"os"
+	goruntime "runtime"
 	"time"
 
 	// +kubebuilder:scaffold:imports
@@ -86,6 +87,7 @@ var (
 	watchFilterValue               string
 	watchNamespace                 string
 	profilerAddress                string
+	enableContentionProfiling      bool
 	kubeadmControlPlaneConcurrency int
 	syncPeriod                     time.Duration
 	restConfigQPS                  float32
@@ -124,6 +126,9 @@ func InitFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&profilerAddress, "profiler-address", "",
 		"Bind address to expose the pprof profiler (e.g. localhost:6060)")
 
+	fs.BoolVar(&enableContentionProfiling, "contention-profiling", false,
+		"Enable block profiling, if profiler-address is set.")
+
 	fs.IntVar(&kubeadmControlPlaneConcurrency, "kubeadmcontrolplane-concurrency", 10,
 		"Number of kubeadm control planes to process simultaneously")
 
@@ -188,6 +193,10 @@ func main() {
 		watchNamespaces = []string{watchNamespace}
 	}
 
+	if profilerAddress != "" && enableContentionProfiling {
+		goruntime.SetBlockProfileRate(1)
+	}
+
 	ctrlOptions := ctrl.Options{
 		Scheme:                     scheme,
 		MetricsBindAddress:         metricsBindAddr,

main.go

@@ -22,6 +22,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	goruntime "runtime"
 	"time"
 
 	// +kubebuilder:scaffold:imports
@@ -86,6 +87,7 @@ var (
 	watchNamespace                string
 	watchFilterValue              string
 	profilerAddress               string
+	enableContentionProfiling     bool
 	clusterTopologyConcurrency    int
 	clusterClassConcurrency       int
 	clusterConcurrency            int
@@ -159,6 +161,9 @@ func InitFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&profilerAddress, "profiler-address", "",
 		"Bind address to expose the pprof profiler (e.g. localhost:6060)")
 
+	fs.BoolVar(&enableContentionProfiling, "contention-profiling", false,
+		"Enable block profiling, if profiler-address is set.")
+
 	fs.IntVar(&clusterTopologyConcurrency, "clustertopology-concurrency", 10,
 		"Number of clusters to process simultaneously")
 
@@ -252,6 +257,10 @@ func main() {
 		watchNamespaces = []string{watchNamespace}
 	}
 
+	if profilerAddress != "" && enableContentionProfiling {
+		goruntime.SetBlockProfileRate(1)
+	}
+
 	ctrlOptions := ctrl.Options{
 		Scheme:                     scheme,
 		MetricsBindAddress:         metricsBindAddr,

test/infrastructure/docker/main.go

@@ -22,6 +22,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	goruntime "runtime"
 	"time"
 
 	// +kubebuilder:scaffold:imports
@@ -73,6 +74,7 @@ var (
 	watchNamespace              string
 	watchFilterValue            string
 	profilerAddress             string
+	enableContentionProfiling   bool
 	concurrency                 int
 	syncPeriod                  time.Duration
 	restConfigQPS               float32
@@ -125,6 +127,9 @@ func initFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&profilerAddress, "profiler-address", "",
 		"Bind address to expose the pprof profiler (e.g. localhost:6060)")
 
+	fs.BoolVar(&enableContentionProfiling, "contention-profiling", false,
+		"Enable block profiling, if profiler-address is set.")
+
 	fs.IntVar(&concurrency, "concurrency", 10,
 		"The number of docker machines to process simultaneously")
 
@@ -186,6 +191,10 @@ func main() {
 		watchNamespaces = []string{watchNamespace}
 	}
 
+	if profilerAddress != "" && enableContentionProfiling {
+		goruntime.SetBlockProfileRate(1)
+	}
+
 	ctrlOptions := ctrl.Options{
 		Scheme:                     scheme,
 		MetricsBindAddress:         metricsBindAddr,

test/infrastructure/inmemory/main.go

@@ -22,6 +22,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	goruntime "runtime"
 	"time"
 
 	"github.com/spf13/pflag"
@@ -68,6 +69,7 @@ var (
 	watchNamespace              string
 	watchFilterValue            string
 	profilerAddress             string
+	enableContentionProfiling   bool
 	clusterConcurrency          int
 	machineConcurrency          int
 	syncPeriod                  time.Duration
@@ -121,6 +123,9 @@ func InitFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&profilerAddress, "profiler-address", "",
 		"Bind address to expose the pprof profiler (e.g. localhost:6060)")
 
+	fs.BoolVar(&enableContentionProfiling, "contention-profiling", false,
+		"Enable block profiling, if profiler-address is set.")
+
 	fs.IntVar(&clusterConcurrency, "cluster-concurrency", 10,
 		"Number of clusters to process simultaneously")
 
@@ -180,6 +185,10 @@ func main() {
 		watchNamespaces = []string{watchNamespace}
 	}
 
+	if profilerAddress != "" && enableContentionProfiling {
+		goruntime.SetBlockProfileRate(1)
+	}
+
 	ctrlOptions := ctrl.Options{
 		Scheme:                     scheme,
 		MetricsBindAddress:         metricsBindAddr,