On Wed, Feb 7, 2018 at 7:04 PM, Thomas Munro <thomas.mu...@enterprisedb.com> wrote: > On Tue, Feb 6, 2018 at 5:21 PM, Peter Eisentraut > <peter.eisentr...@2ndquadrant.com> wrote: >> On 9/18/17 22:41, Andres Freund wrote: >>> Rearm statement_timeout after each executed query. >> >> This appears to have broken statement_timeout behavior in master such >> that only every second query is affected by it. > > Yeah, I also just ran into this while testing a nearby complaint about > statement timeouts vs parallel query. In the error path > stmt_timeout_active remains true, so the next statement does nothing > in enable_statement_timeout(). I think we just need to clear that > flag in the error path, right where we call disable_all_timeouts(). > See attached.
Looks right. Committed, but I thought the comment was strange (forget about?) so I just left that out. -- Robert Haas EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company