Skip to content

K8SPG-761: Apply PGO_WORKERS to all controllers #1189

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

Merged
hors merged 5 commits into from
Jun 30, 2025
Merged

K8SPG-761: Apply PGO_WORKERS to all controllers #1189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1de63a
K8SPG-761: Apply PGO_WORKERS to all controllers
egegunes Jun 29, 2025
a46da34
fix unit tests
egegunes Jun 30, 2025
2eef2ba
Merge branch 'main' into K8SPG-761
hors Jun 30, 2025
52aeabe
Merge branch 'main' into K8SPG-761
hors Jun 30, 2025
06263f0
fix golangci-lint
egegunes Jun 30, 2025
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
12 changes: 10 additions & 2 deletions cmd/postgres-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,20 @@ func initManager(ctx context.Context) (runtime.Options, error) {
}

options.Controller.GroupKindConcurrency = map[string]int{
"PostgresCluster." + v1beta1.GroupVersion.Group: 2,
"PostgresCluster." + v1beta1.GroupVersion.Group: 1,
"PGUpgrade." + v1beta1.GroupVersion.Group: 1,
"PGAdmin." + v1beta1.GroupVersion.Group: 1,
"PerconaPGCluster." + v2.GroupVersion.Group: 1,
"PerconaPGUpgrade." + v2.GroupVersion.Group: 1,
"PerconaPGBackup." + v2.GroupVersion.Group: 1,
"PerconaPGRestore." + v2.GroupVersion.Group: 1,
}

if s := os.Getenv("PGO_WORKERS"); s != "" {
if i, err := strconv.Atoi(s); err == nil && i > 0 {
options.Controller.GroupKindConcurrency["PostgresCluster."+v1beta1.GroupVersion.Group] = i
for kind := range options.Controller.GroupKindConcurrency {
options.Controller.GroupKindConcurrency[kind] = i
}
} else {
log.Error(err, "PGO_WORKERS must be a positive number")
}
Expand Down
22 changes: 20 additions & 2 deletions cmd/postgres-operator/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,13 @@ func TestInitManager(t *testing.T) {

assert.DeepEqual(t, options.Controller.GroupKindConcurrency,
map[string]int{
"PostgresCluster.postgres-operator.crunchydata.com": 2,
"PGAdmin.postgres-operator.crunchydata.com": 1,
"PGUpgrade.postgres-operator.crunchydata.com": 1,
"PerconaPGBackup.pgv2.percona.com": 1,
"PerconaPGCluster.pgv2.percona.com": 1,
"PerconaPGRestore.pgv2.percona.com": 1,
"PerconaPGUpgrade.pgv2.percona.com": 1,
"PostgresCluster.postgres-operator.crunchydata.com": 1,
})

assert.Assert(t, options.Cache.DefaultNamespaces == nil)
Expand Down Expand Up @@ -103,7 +109,13 @@ func TestInitManager(t *testing.T) {
assert.NilError(t, err)
assert.DeepEqual(t, options.Controller.GroupKindConcurrency,
map[string]int{
"PostgresCluster.postgres-operator.crunchydata.com": 2,
"PGAdmin.postgres-operator.crunchydata.com": 1,
"PGUpgrade.postgres-operator.crunchydata.com": 1,
"PerconaPGBackup.pgv2.percona.com": 1,
"PerconaPGCluster.pgv2.percona.com": 1,
"PerconaPGRestore.pgv2.percona.com": 1,
"PerconaPGUpgrade.pgv2.percona.com": 1,
"PostgresCluster.postgres-operator.crunchydata.com": 1,
})
}
})
Expand All @@ -115,6 +127,12 @@ func TestInitManager(t *testing.T) {
assert.NilError(t, err)
assert.DeepEqual(t, options.Controller.GroupKindConcurrency,
map[string]int{
"PGAdmin.postgres-operator.crunchydata.com": 19,
"PGUpgrade.postgres-operator.crunchydata.com": 19,
"PerconaPGBackup.pgv2.percona.com": 19,
"PerconaPGCluster.pgv2.percona.com": 19,
"PerconaPGRestore.pgv2.percona.com": 19,
"PerconaPGUpgrade.pgv2.percona.com": 19,
"PostgresCluster.postgres-operator.crunchydata.com": 19,
})
})
Expand Down
Loading