Skip to content

Commit c502fea

Browse files
egeguneshors
andauthored
K8SPG-761: Apply PGO_WORKERS to all controllers (#1189)
* K8SPG-761: Apply PGO_WORKERS to all controllers * fix unit tests * fix golangci-lint --------- Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>
1 parent 99b7ea4 commit c502fea

File tree

2 files changed

+30
-4
lines changed

2 files changed

+30
-4
lines changed

cmd/postgres-operator/main.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,20 @@ func initManager(ctx context.Context) (runtime.Options, error) {
305305
}
306306

307307
options.Controller.GroupKindConcurrency = map[string]int{
308-
"PostgresCluster." + v1beta1.GroupVersion.Group: 2,
308+
"PostgresCluster." + v1beta1.GroupVersion.Group: 1,
309+
"PGUpgrade." + v1beta1.GroupVersion.Group: 1,
310+
"PGAdmin." + v1beta1.GroupVersion.Group: 1,
311+
"PerconaPGCluster." + v2.GroupVersion.Group: 1,
312+
"PerconaPGUpgrade." + v2.GroupVersion.Group: 1,
313+
"PerconaPGBackup." + v2.GroupVersion.Group: 1,
314+
"PerconaPGRestore." + v2.GroupVersion.Group: 1,
309315
}
310316

311317
if s := os.Getenv("PGO_WORKERS"); s != "" {
312318
if i, err := strconv.Atoi(s); err == nil && i > 0 {
313-
options.Controller.GroupKindConcurrency["PostgresCluster."+v1beta1.GroupVersion.Group] = i
319+
for kind := range options.Controller.GroupKindConcurrency {
320+
options.Controller.GroupKindConcurrency[kind] = i
321+
}
314322
} else {
315323
log.Error(err, "PGO_WORKERS must be a positive number")
316324
}

cmd/postgres-operator/main_test.go

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ func TestInitManager(t *testing.T) {
2828

2929
assert.DeepEqual(t, options.Controller.GroupKindConcurrency,
3030
map[string]int{
31-
"PostgresCluster.postgres-operator.crunchydata.com": 2,
31+
"PGAdmin.postgres-operator.crunchydata.com": 1,
32+
"PGUpgrade.postgres-operator.crunchydata.com": 1,
33+
"PerconaPGBackup.pgv2.percona.com": 1,
34+
"PerconaPGCluster.pgv2.percona.com": 1,
35+
"PerconaPGRestore.pgv2.percona.com": 1,
36+
"PerconaPGUpgrade.pgv2.percona.com": 1,
37+
"PostgresCluster.postgres-operator.crunchydata.com": 1,
3238
})
3339

3440
assert.Assert(t, options.Cache.DefaultNamespaces == nil)
@@ -103,7 +109,13 @@ func TestInitManager(t *testing.T) {
103109
assert.NilError(t, err)
104110
assert.DeepEqual(t, options.Controller.GroupKindConcurrency,
105111
map[string]int{
106-
"PostgresCluster.postgres-operator.crunchydata.com": 2,
112+
"PGAdmin.postgres-operator.crunchydata.com": 1,
113+
"PGUpgrade.postgres-operator.crunchydata.com": 1,
114+
"PerconaPGBackup.pgv2.percona.com": 1,
115+
"PerconaPGCluster.pgv2.percona.com": 1,
116+
"PerconaPGRestore.pgv2.percona.com": 1,
117+
"PerconaPGUpgrade.pgv2.percona.com": 1,
118+
"PostgresCluster.postgres-operator.crunchydata.com": 1,
107119
})
108120
}
109121
})
@@ -115,6 +127,12 @@ func TestInitManager(t *testing.T) {
115127
assert.NilError(t, err)
116128
assert.DeepEqual(t, options.Controller.GroupKindConcurrency,
117129
map[string]int{
130+
"PGAdmin.postgres-operator.crunchydata.com": 19,
131+
"PGUpgrade.postgres-operator.crunchydata.com": 19,
132+
"PerconaPGBackup.pgv2.percona.com": 19,
133+
"PerconaPGCluster.pgv2.percona.com": 19,
134+
"PerconaPGRestore.pgv2.percona.com": 19,
135+
"PerconaPGUpgrade.pgv2.percona.com": 19,
118136
"PostgresCluster.postgres-operator.crunchydata.com": 19,
119137
})
120138
})

0 commit comments

Comments
 (0)