1336210 - Proxy the __lbheartbeat__ route through nginx to tornado

Status: RESOLVED FIXED

(Conduit :: General, defect)

Description

[Israel Madueme [:imadueme]]

Bug https://bugzilla.mozilla.org/show_bug.cgi?id=1334498 added the __lbheartbeat__ end point on the tornado API. When connecting directly to the tornado server, this route works perfectly.

When the tornado server is proxied behind nginx, this route is unreachable. This is because the nginx by default only proxies urls prefixed with /api/ to the tornado server.

Nginx should also proxy /__lbheartbeat__ to the tornado server.

Comment 1

[Israel Madueme [:imadueme]]

Attachment: autoland: update nginx location to also proxy /__lbheartbeat__ to tornado (bug 1336210).

This commit updates the regex to match either /api/.* or /__lbheartbeat__
will proxy the request to the tornado server.

Review commit: https://reviewboard.mozilla.org/r/109288/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/109288/

Comment 2

[Māris Fogels [:mars] (please needinfo)]

Comment on attachment 8833061 [details]
autoland: update nginx location to also proxy /__lbheartbeat__ to tornado (bug 1336210).

https://reviewboard.mozilla.org/r/109288/#review110724

Tested locally, LGTM

Comment 3

[Steven MacLeod [:smacleod]]

Comment on attachment 8833061 [details]
autoland: update nginx location to also proxy /__lbheartbeat__ to tornado (bug 1336210).

https://reviewboard.mozilla.org/r/109288/#review111588

::: autoland/docker/web/nginx-conf.d/default.conf:10
(Diff revision 1)
>      location / {
>          proxy_pass  http://yarn:4000/;
>      }
>  
>      # Proxy requests to the autoland backing service
> -    location ~ /api/.* {
> +    location ~ (/api/.*|__lbheartbeat__) {

Will this match on `/__lbheartbeat__/` (trialing slash) as well? if not please fix in a followup.

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/automation/conduit/rev/f1e213a00938
autoland: update nginx location to also proxy /__lbheartbeat__ to tornado . r=mars,smacleod

Comment 5

[Israel Madueme [:imadueme]]

Comment on attachment 8833061 [details]
autoland: update nginx location to also proxy /__lbheartbeat__ to tornado (bug 1336210).

https://reviewboard.mozilla.org/r/109288/#review111588

> Will this match on `/__lbheartbeat__/` (trialing slash) as well? if not please fix in a followup.

I confirmed that it indeed matches both `/__lbheartbeat__` and ` /__lbheartbeat__/`