Repository navigation
Commit e5aeca8
authored
fix(switchover): detect missing WAL-archiver native sidecars (#11059)
archiverSidecarMissingOnPrimary compared only Spec.Containers, so a
WAL-archiver plugin that injects its sidecar as a native sidecar (an
init container with RestartPolicy=Always, as plugin-barman-cloud does)
was never detected. The primary was then rolled out through a switchover
that dead-locks, because a clean demotion archives pending WAL with the
very sidecar that is still missing.
Compare native-sidecar init containers as well, so the missing sidecar
is detected and the primary is recreated in place instead.
This completes the fix from #11032, which addressed #10981 but missed
plugins that inject the archiver as a native sidecar.
Signed-off-by: Marco Nenciarini <[email protected]>1 parent eddf794 commit e5aeca8
2 files changed
Lines changed: 52 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
770 | 770 | | |
771 | 771 | | |
772 | 772 | | |
773 | | - | |
774 | | - | |
775 | | - | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
776 | 777 | | |
777 | 778 | | |
778 | 779 | | |
| |||
798 | 799 | | |
799 | 800 | | |
800 | 801 | | |
801 | | - | |
802 | | - | |
803 | | - | |
| 802 | + | |
| 803 | + | |
| 804 | + | |
| 805 | + | |
| 806 | + | |
| 807 | + | |
| 808 | + | |
| 809 | + | |
| 810 | + | |
| 811 | + | |
| 812 | + | |
| 813 | + | |
| 814 | + | |
| 815 | + | |
| 816 | + | |
| 817 | + | |
| 818 | + | |
| 819 | + | |
804 | 820 | | |
805 | | - | |
806 | | - | |
| 821 | + | |
| 822 | + | |
| 823 | + | |
| 824 | + | |
807 | 825 | | |
808 | 826 | | |
809 | 827 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1198 | 1198 | | |
1199 | 1199 | | |
1200 | 1200 | | |
| 1201 | + | |
| 1202 | + | |
1201 | 1203 | | |
1202 | 1204 | | |
1203 | | - | |
1204 | | - | |
1205 | | - | |
| 1205 | + | |
| 1206 | + | |
| 1207 | + | |
| 1208 | + | |
1206 | 1209 | | |
1207 | 1210 | | |
1208 | 1211 | | |
| |||
1250 | 1253 | | |
1251 | 1254 | | |
1252 | 1255 | | |
| 1256 | + | |
| 1257 | + | |
| 1258 | + | |
| 1259 | + | |
| 1260 | + | |
| 1261 | + | |
| 1262 | + | |
| 1263 | + | |
| 1264 | + | |
| 1265 | + | |
| 1266 | + | |
| 1267 | + | |
| 1268 | + | |
| 1269 | + | |
| 1270 | + | |
| 1271 | + | |
| 1272 | + | |
| 1273 | + | |
| 1274 | + | |
| 1275 | + | |
1253 | 1276 | | |
1254 | 1277 | | |
1255 | 1278 | | |
| |||
0 commit comments