Repository navigation
Commit 35ddc2a
committed
Fix flaky FPM test for bug #77023
The test sent two parallel requests to a pool with a single child and
expected the dynamic process manager to spawn a second child. That only
happens when the idle server maintenance heartbeat (1s) fires while the
child is busy, but the scripts kept it busy for just 300ms each, so the
spawn was a matter of luck and the total processes check failed on slow
machines.
Use a single request that blocks the child for longer than the heartbeat
so the spare child is always spawned, and rely on the fact that the
blocked child is the oldest idle one and is therefore quit first. One
blocked child is enough to verify the SIGKILL fallback. Replace the fixed
sleep with log timeouts and poll the status until the spare child is quit.1 parent 563735d commit 35ddc2a
1 file changed
Lines changed: 15 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
| |||
32 | 31 | | |
33 | 32 | | |
34 | 33 | | |
35 | | - | |
| 34 | + | |
36 | 35 | | |
37 | 36 | | |
38 | | - | |
39 | 37 | | |
40 | 38 | | |
41 | 39 | | |
42 | | - | |
| 40 | + | |
43 | 41 | | |
44 | 42 | | |
45 | 43 | | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
51 | 49 | | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
52 | 58 | | |
53 | 59 | | |
54 | 60 | | |
| |||
0 commit comments