Skip to content

Commit 1342d5b

Browse files
authored
fix(snapshot-restore): bump machinery to v0.4.0 for pgsql_tmp* directory removal (#10447)
Upgrade cloudnative-pg/machinery from v0.3.3 to v0.4.0 which uses os.RemoveAll instead of os.Remove in RemoveFiles, fixing snapshot restore failures when non-empty pgsql_tmp* directories exist in PGDATA. Extensions loaded via `shared_preload_libraries` (e.g. vchord) can create directories like `pgsql_tmp_vchord_sampling/` in PGDATA during recovery, and the standard PostgreSQL `pgsql_tmp/` directory may also contain temporary files. These are ephemeral runtime artifacts that should be removed unconditionally during restore cleanup. Closes #10398 Signed-off-by: Marco Nenciarini <[email protected]>
1 parent cd77e4b commit 1342d5b

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/cheynewallace/tabby v1.1.1
1414
github.com/cloudnative-pg/barman-cloud v0.5.0
1515
github.com/cloudnative-pg/cnpg-i v0.5.0
16-
github.com/cloudnative-pg/machinery v0.3.3
16+
github.com/cloudnative-pg/machinery v0.4.0
1717
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1818
github.com/evanphx/json-patch/v5 v5.9.11
1919
github.com/go-logr/logr v1.4.3
@@ -121,7 +121,7 @@ require (
121121
google.golang.org/protobuf v1.36.11 // indirect
122122
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
123123
gopkg.in/inf.v0 v0.9.1 // indirect
124-
k8s.io/klog/v2 v2.130.1 // indirect
124+
k8s.io/klog/v2 v2.140.0 // indirect
125125
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
126126
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
127127
sigs.k8s.io/kustomize/api v0.20.1 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ github.com/cloudnative-pg/barman-cloud v0.5.0 h1:DykSaX4o7ee2vyu5FQoG1RJsntHd+EI
2424
github.com/cloudnative-pg/barman-cloud v0.5.0/go.mod h1:SO2HzLa+GWlSIpGyxnISoJAFPIcaa/qDa33Bb3jefac=
2525
github.com/cloudnative-pg/cnpg-i v0.5.0 h1:/TOzpNT6cwNgrpftTtrnLKdoHgMwd+88vZgXjlVgXeE=
2626
github.com/cloudnative-pg/cnpg-i v0.5.0/go.mod h1:7Gh4+UzhBpGhr4DreB1GN9wGYfvxwXCXZUyVt3zE/3I=
27-
github.com/cloudnative-pg/machinery v0.3.3 h1:CaqXqLTJH9RrVv3R/YU0NmFaI/F18HLg2JfH3mQLcDk=
28-
github.com/cloudnative-pg/machinery v0.3.3/go.mod h1:RYAYlVKBF5pH4mg+Q8wHjNDyENV9ajbkG41zOEf8DEs=
27+
github.com/cloudnative-pg/machinery v0.4.0 h1:3sfqrBptH4QQSVB4g10Z+7aiQRnh4g+6AsqsK0ibKaQ=
28+
github.com/cloudnative-pg/machinery v0.4.0/go.mod h1:OIwaTYAnLv8PmBmBvEf0BvMK2JBX6J+naTMg9UgV1FQ=
2929
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
3030
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
3131
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -312,8 +312,8 @@ k8s.io/cli-runtime v0.35.3 h1:UZq4ipNimtzBmhN7PPKbfAdqo8quK0H0UdGl6qAQnqI=
312312
k8s.io/cli-runtime v0.35.3/go.mod h1:O7MUmCqcKSd5xI+O5X7/pRkB5l0O2NIhOdUVwbHLXu4=
313313
k8s.io/client-go v0.35.3 h1:s1lZbpN4uI6IxeTM2cpdtrwHcSOBML1ODNTCCfsP1pg=
314314
k8s.io/client-go v0.35.3/go.mod h1:RzoXkc0mzpWIDvBrRnD+VlfXP+lRzqQjCmKtiwZ8Q9c=
315-
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
316-
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
315+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
316+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
317317
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e h1:iW9ChlU0cU16w8MpVYjXk12dqQ4BPFBEgif+ap7/hqQ=
318318
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
319319
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 h1:AZYQSJemyQB5eRxqcPky+/7EdBj0xi3g0ZcxxJ7vbWU=

0 commit comments

Comments
 (0)