mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
4e3c6d9b7a
If code inside a context manager returns a generator, the context manager exits before the generator is iterated. hgweb was using a context manager to control thread safe access to a localrepository instance. But it was returning a generator, so there was a race condition between a previous request streaming a response to the client and a new request obtaining the released but in use repository. By iterating the generator inside the context manager, we ensure we don't release the repo instance until after the response has finished. With this change, hgweb finally appears to have full localrepository isolation between threads. I can no longer reproduce the 2 exceptions reported in issue4756. test-hgweb-non-interactive.t has been modified to consume the output of calling into a WSGI application. Without this, execution of the WSGI application stalls because of the added yield statement.
85 lines
2.4 KiB
Perl
85 lines
2.4 KiB
Perl
Tests if hgweb can run without touching sys.stdin, as is required
|
|
by the WSGI standard and strictly implemented by mod_wsgi.
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ echo foo > bar
|
|
$ hg add bar
|
|
$ hg commit -m "test"
|
|
$ cat > request.py <<EOF
|
|
> from mercurial import dispatch
|
|
> from mercurial.hgweb.hgweb_mod import hgweb
|
|
> from mercurial.ui import ui
|
|
> from mercurial import hg
|
|
> from StringIO import StringIO
|
|
> import os, sys
|
|
>
|
|
> class FileLike(object):
|
|
> def __init__(self, real):
|
|
> self.real = real
|
|
> def fileno(self):
|
|
> print >> sys.__stdout__, 'FILENO'
|
|
> return self.real.fileno()
|
|
> def read(self):
|
|
> print >> sys.__stdout__, 'READ'
|
|
> return self.real.read()
|
|
> def readline(self):
|
|
> print >> sys.__stdout__, 'READLINE'
|
|
> return self.real.readline()
|
|
>
|
|
> sys.stdin = FileLike(sys.stdin)
|
|
> errors = StringIO()
|
|
> input = StringIO()
|
|
> output = StringIO()
|
|
>
|
|
> def startrsp(status, headers):
|
|
> print '---- STATUS'
|
|
> print status
|
|
> print '---- HEADERS'
|
|
> print [i for i in headers if i[0] != 'ETag']
|
|
> print '---- DATA'
|
|
> return output.write
|
|
>
|
|
> env = {
|
|
> 'wsgi.version': (1, 0),
|
|
> 'wsgi.url_scheme': 'http',
|
|
> 'wsgi.errors': errors,
|
|
> 'wsgi.input': input,
|
|
> 'wsgi.multithread': False,
|
|
> 'wsgi.multiprocess': False,
|
|
> 'wsgi.run_once': False,
|
|
> 'REQUEST_METHOD': 'GET',
|
|
> 'SCRIPT_NAME': '',
|
|
> 'PATH_INFO': '',
|
|
> 'QUERY_STRING': '',
|
|
> 'SERVER_NAME': '127.0.0.1',
|
|
> 'SERVER_PORT': os.environ['HGPORT'],
|
|
> 'SERVER_PROTOCOL': 'HTTP/1.0'
|
|
> }
|
|
>
|
|
> i = hgweb('.')
|
|
> for c in i(env, startrsp):
|
|
> pass
|
|
> print '---- ERRORS'
|
|
> print errors.getvalue()
|
|
> print '---- OS.ENVIRON wsgi variables'
|
|
> print sorted([x for x in os.environ if x.startswith('wsgi')])
|
|
> print '---- request.ENVIRON wsgi variables'
|
|
> with i._obtainrepo() as repo:
|
|
> print sorted([x for x in repo.ui.environ if x.startswith('wsgi')])
|
|
> EOF
|
|
$ python request.py
|
|
---- STATUS
|
|
200 Script output follows
|
|
---- HEADERS
|
|
[('Content-Type', 'text/html; charset=ascii')]
|
|
---- DATA
|
|
---- ERRORS
|
|
|
|
---- OS.ENVIRON wsgi variables
|
|
[]
|
|
---- request.ENVIRON wsgi variables
|
|
['wsgi.errors', 'wsgi.input', 'wsgi.multiprocess', 'wsgi.multithread', 'wsgi.run_once', 'wsgi.url_scheme', 'wsgi.version']
|
|
|
|
$ cd ..
|