On 7/20/20 4:20 PM, Eduardo Habkost wrote:
On Mon, Jul 20, 2020 at 12:02:52PM -0400, John Snow wrote:
3 seconds is too short for some tests running inside busy VMs. Build it out to
a rather generous 30 seconds to find out conclusively if there are more severe
problems in the merge/CI tests.
Signed-off-by: John Snow <[email protected]>
It's weird how the hard shutdown method has a more graceful
timeout than graceful shutdown (60 seconds vs 3 seconds).
I would make both have the same timeout, but it's better to try
this only after 5.1.0.
Reviewed-by: Eduardo Habkost <[email protected]>
Peter, do you want to take this directly to see if it starts to fix the
merge tests for you?
It extends the shutdown timeout from 3 to 30 seconds. If it still hangs
at 30 seconds, I think there's clearly something much worse going on
that will need to be investigated.
--js
