The recent sync changes to avoid blocking forever depend on thread interrupts which it turns out jdbc doesn't always respect. Rework the timeouts to avoid depending on interrupts.