Mercurial > hg
view tests/test-pending.t @ 37631:2f626233859b
wireproto: implement batching on peer executor interface
This is a bit more complicated than non-batch requests because we
need to buffer sends until the last request arrives *and* we need
to support resolving futures as data arrives from the remote.
In a classical concurrent.futures executor model, the future
"starts" as soon as it is submitted. However, we have nothing to
start until the last command is submitted.
If we did nothing, calling result() would deadlock, since the future
hasn't "started." So in the case where we queue the command, we return
a special future type whose result() will trigger sendcommands().
This eliminates the deadlock potential. It also serves as a check
against callers who may be calling result() prematurely, as it will
prevent any subsequent callcommands() from working. This behavior
is slightly annoying and a bit restrictive. But it's the world
that half duplex connections forces on us.
In order to support streaming responses, we were previously using
a generator. But with a futures-based API, we're using futures
and not generators. So in order to get streaming, we need a
background thread to read data from the server.
The approach taken in this patch is to leverage the ThreadPoolExecutor
from concurrent.futures for managing a background thread. We create
an executor and future that resolves when all response data is
processed (or an error occurs). When exiting the context manager,
we wait on that background reading before returning.
I was hoping we could manually spin up a threading.Thread and this
would be simple. But I ran into a few deadlocks when implementing.
After looking at the source code to concurrent.futures, I figured
it would just be easier to use a ThreadPoolExecutor than implement
all the code needed to manually manage a thread.
To prove this works, a use of the batch API in discovery has been
updated.
Differential Revision: https://phab.mercurial-scm.org/D3269
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 13 Apr 2018 11:02:34 -0700 |
parents | f14879f61cd8 |
children | 58786930ea27 |
line wrap: on
line source
Verify that pending changesets are seen by pretxn* hooks but not by other processes that access the destination repo while the hooks are running. The hooks (python and external) both reject changesets after some think time, during which another process runs pull. Each hook creates a file ('notify') to indicate to the controlling process that it is running; the process removes the file to indicate the hook can terminate. init env vars $ d=`pwd` $ maxwait=20 utility to run the test - start a push in the background and run pull $ dotest() { > rm -f notify > printf 'push '; hg -R child-push tip --template '{node}\n' > hg -R child-push -q push > push.out 2>&1 & > > # wait for hook to create the notify file > i=$maxwait > while [ ! -f notify -a $i != 0 ]; do > sleep 1 > i=`expr $i - 1` > done > > # run pull > hg -R child-pull -q pull > rc=$? > > # tell hook to finish; notify should exist. > rm notify > wait > > cat push.out > printf 'pull '; hg -R child-pull tip --template '{node}\n' > return $rc > } python hook $ cat <<EOF > reject.py > import os, time > from mercurial import ui, localrepo > def rejecthook(ui, repo, hooktype, node, **opts): > ui.write(b'hook %s\\n' % repo[b'tip'].hex()) > # create the notify file so caller knows we're running > fpath = os.path.join('$d', 'notify') > f = open(fpath, 'w') > f.close() > # wait for ack - caller should delete the notify file > i = $maxwait > while os.path.exists(fpath) and i > 0: > time.sleep(1) > i -= 1 > return True # reject the changesets > EOF external hook $ cat <<EOF > reject.sh > printf 'hook '; hg tip --template '{node}\\n' > # create the notify file so caller knows we're running > fpath=$d/notify > touch \$fpath > # wait for ack - caller should delete the notify file > i=$maxwait > while [ -f \$fpath -a \$i != 0 ]; do > sleep 1 > i=\`expr \$i - 1\` > done > exit 1 # reject the changesets > EOF create repos $ hg init parent $ hg clone -q parent child-push $ hg clone -q parent child-pull $ echo a > child-push/a $ hg -R child-push add child-push/a $ hg -R child-push commit -m a -d '1000000 0' test python hook $ cat <<EOF > parent/.hg/hgrc > [extensions] > reject = $d/reject.py > [hooks] > pretxnchangegroup = python:reject.rejecthook > EOF $ dotest push 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b hook 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b transaction abort! rollback completed abort: pretxnchangegroup hook failed pull 0000000000000000000000000000000000000000 test external hook $ cat <<EOF > parent/.hg/hgrc > [hooks] > pretxnchangegroup = sh $d/reject.sh > EOF $ dotest push 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b hook 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b transaction abort! rollback completed abort: pretxnchangegroup hook exited with status 1 pull 0000000000000000000000000000000000000000 Test that pending on transaction without changegroup see the normal changegroup( (issue4609) $ cat <<EOF > parent/.hg/hgrc > [hooks] > pretxnchangegroup= > pretxnclose = hg tip -T "tip: {node|short}\n" > [phases] > publishing=False > EOF setup $ cd parent $ echo a > a $ hg add a $ hg commit -m a tip: cb9a9f314b8b actual test $ hg phase --public . tip: cb9a9f314b8b