Repository navigation
Commit 58b7172
committed
Fix deferrable KPO trigger_reentry crash when pod is GC'd before re-entry
When KubernetesPodOperator runs in deferrable mode and the pod is reclaimed by
Kubernetes between the trigger firing and the worker re-entering the task,
the unguarded `self.pod = self.hook.get_pod(...)` in `trigger_reentry` raises
`ApiException(404)` and escapes. The dead-code `if not self.pod:` branch
intended to translate this to `PodNotFoundException` is never reached because
`get_pod` raises rather than returning `None`.
Wrap the `get_pod` call so that:
- Non-404 ApiExceptions re-raise unchanged.
- 404 + event status "success" returns cleanly (the trigger already observed
the pod completed successfully; logs/XCom are unrecoverable but the task
itself succeeded).
- 404 + non-success event raises `PodNotFoundException` (matches existing
dead-code intent).
Refs apache#66715.1 parent 74abe58 commit 58b7172
2 files changed
Lines changed: 99 additions & 2 deletions
File tree
- providers/cncf/kubernetes
- src/airflow/providers/cncf/kubernetes/operators
- tests/unit/cncf/kubernetes/operators
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
962 | 962 | | |
963 | 963 | | |
964 | 964 | | |
965 | | - | |
| 965 | + | |
| 966 | + | |
| 967 | + | |
| 968 | + | |
| 969 | + | |
| 970 | + | |
| 971 | + | |
| 972 | + | |
| 973 | + | |
| 974 | + | |
| 975 | + | |
| 976 | + | |
| 977 | + | |
| 978 | + | |
| 979 | + | |
| 980 | + | |
| 981 | + | |
| 982 | + | |
| 983 | + | |
| 984 | + | |
966 | 985 | | |
967 | 986 | | |
| 987 | + | |
| 988 | + | |
968 | 989 | | |
969 | 990 | | |
970 | 991 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
43 | 48 | | |
44 | 49 | | |
45 | 50 | | |
| |||
3123 | 3128 | | |
3124 | 3129 | | |
3125 | 3130 | | |
| 3131 | + | |
| 3132 | + | |
| 3133 | + | |
| 3134 | + | |
| 3135 | + | |
| 3136 | + | |
| 3137 | + | |
| 3138 | + | |
| 3139 | + | |
| 3140 | + | |
| 3141 | + | |
| 3142 | + | |
| 3143 | + | |
| 3144 | + | |
| 3145 | + | |
| 3146 | + | |
| 3147 | + | |
| 3148 | + | |
| 3149 | + | |
| 3150 | + | |
| 3151 | + | |
| 3152 | + | |
| 3153 | + | |
| 3154 | + | |
| 3155 | + | |
| 3156 | + | |
| 3157 | + | |
| 3158 | + | |
| 3159 | + | |
| 3160 | + | |
| 3161 | + | |
| 3162 | + | |
| 3163 | + | |
| 3164 | + | |
| 3165 | + | |
| 3166 | + | |
| 3167 | + | |
| 3168 | + | |
| 3169 | + | |
| 3170 | + | |
| 3171 | + | |
| 3172 | + | |
| 3173 | + | |
| 3174 | + | |
| 3175 | + | |
| 3176 | + | |
| 3177 | + | |
| 3178 | + | |
| 3179 | + | |
| 3180 | + | |
| 3181 | + | |
| 3182 | + | |
| 3183 | + | |
| 3184 | + | |
| 3185 | + | |
| 3186 | + | |
| 3187 | + | |
| 3188 | + | |
| 3189 | + | |
| 3190 | + | |
| 3191 | + | |
| 3192 | + | |
| 3193 | + | |
| 3194 | + | |
| 3195 | + | |
| 3196 | + | |
| 3197 | + | |
| 3198 | + | |
| 3199 | + | |
| 3200 | + | |
| 3201 | + | |
3126 | 3202 | | |
3127 | 3203 | | |
3128 | 3204 | | |
| |||
0 commit comments