880102 - Tweaks to get long-query-timeouts working in stage

Status: RESOLVED FIXED

(Cloud Services Graveyard :: Server: Sync, defect)

Description

[Ryan Kelly [:rfkelly]]

Attachment: patch against upstream PyMySQL release

Following up from Bug 879094, we need a couple of tweaks to PyMySQL to get the long-query-timeout-killing thing working properly.  I'm going to take the liberty of committing and tagging so as not to block Ops, but am filing this bug to keep track of everything.

First, I'm attaching a patch that gets applied to the upstream PyMySQL release as part of the build process.  It combines these two upstream bugs into a single patch:

  * https://github.com/petehunt/PyMySQL/pull/148
  * https://github.com/petehunt/PyMySQL/pull/150

I'm not thrilled that these patches are starting to pile up, but at least they're small and simple so far...

Comment 1

[Ryan Kelly [:rfkelly]]

Attachment: patch to log attempts at query killing

Second is a bit of debug logging so that we have visibility into when queries are being killed.

Comment 2

[Toby Elliott [:telliott]]

Comment on attachment 758929 [details]
patch against upstream PyMySQL release

If you're planning to submit this back upstream, recommend you break it out into two: the except changes and the unpack changes.

Comment 3

[Toby Elliott [:telliott]]

Comment on attachment 758930 [details] [diff] [review]
patch to log attempts at query killing

Recommend adding the query string to the "unsafe query" log so we have a little more information when it does happen.

Comment 4

[Ryan Kelly [:rfkelly]]

(In reply to Toby Elliott [:telliott] from comment #2)
> If you're planning to submit this back upstream, recommend you break it out
> into two: the except changes and the unpack changes.

Yep; see the two independent pull request links above :-)

(In reply to Toby Elliott [:telliott] from comment #3)
> Recommend adding the query string to the "unsafe query" log so we have a
> little more information when it does happen.

http://hg.mozilla.org/services/server-core/rev/ff1d9a20bc76