This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2958

infinitepush: introduce server option to route every push to bundlestore
ClosedPublic

Authored by pulkit on Mar 27 2018, 8:38 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG571f25dae740: infinitepush: introduce server option to route every push to bundlestore
Summary

This patch introduces a new config option for server
infinitepush.pushtobundlestore which if sets to True, the server will route
each incoming push to the bundlestore and store all the parts i.e. changegroups,
phases, obsmarkers in the bundlestore and won't be applied to the revlog.

This config option does not need any client side wrapping and does not need any
custom bundle2 part or stream level parameter to decide where the push should
go.

This is very useful for Mozilla CI use case where they have a central server
that recieves pushes to trigger code-reviews, trigger a test run of CI, run
static analysis etc. The server using the new config option can stash standalone
bundles to the bundlestore and server can get access to individual revisions on
demand.

A new test file which has related tests are added for the config option.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Mar 27 2018, 8:38 AM
indygreg accepted this revision.Mar 30 2018, 2:25 PM
indygreg added a subscriber: indygreg.

This looks reasonable.

Could we also please get an explicit test for hg pull -r <rev> in this server configuration? Yes, I believe that will be redundant with other tests. But it is useful to have explicit coverage for this specific server operation mode.

tests/test-infinitepush-ci.t
143

I actually think the behavior is acceptable. Having to dynamically overlay multiple bundles from the bundle store on the server feels like it will be a lot of work. For cases where the server is mainly ingesting ad-hoc commits, it is fine to have to re-push changesets.

This could get annoying if people are pushing very large changesets. But until we have a better store, I don't think there's much we can do.

This revision is now accepted and ready to land.Mar 30 2018, 2:25 PM
Closed by commit rHG571f25dae740: infinitepush: introduce server option to route every push to bundlestore (authored by pulkit). · Explain WhyMar 30 2018, 3:53 PM
This revision was automatically updated to reflect the committed changes.
mharbison72 added a subscriber: mharbison72.Mar 30 2018, 9:09 PM
mharbison72 added inline comments.
tests/test-infinitepush-ci.t
79

On Windows, this command fails like so. Any thoughts on the unexpected end of stream?

--- c:/Users/Matt/projects/hg/tests/test-infinitepush-ci.t
+++ c:/Users/Matt/projects/hg/tests/test-infinitepush-ci.t.err
@@ -78,15 +78,12 @@

   $ hg unbundle .hg/scratchbranches/filebundlestore/a4/c2/a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
   adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
-  new changesets 6cb0989601f1
-  (run 'hg update' to get a working copy)
-
-  $ hg glog
-  o  1:6cb0989601f1 added a
-  |  public
+  transaction abort!
+  rollback completed
+  abort: stream ended unexpectedly  (got 68 bytes, expected 218759168)
+  [255]
+
+  $ hg glog
   @  0:67145f466344 initialcommit
      public
pulkit added inline comments.Apr 11 2018, 4:56 AM
tests/test-infinitepush-ci.t
79

I looked at code but was unable to find any reason.
(Sorry for getting late to reply, I have phabricator emails turned off and I missed this one in mailing list.)

Revision Contents
Changeset List

Diff 7430

hgext/infinitepush/__init__.py

# Client-side option. Used by --list-remote option. List of remote scratch # Client-side option. Used by --list-remote option. List of remote scratch
# patterns to list if no patterns are specified. # patterns to list if no patterns are specified.
defaultremotepatterns = ['*'] defaultremotepatterns = ['*']
# Instructs infinitepush to forward all received bundle2 parts to the # Instructs infinitepush to forward all received bundle2 parts to the
# bundle for storage. Defaults to False. # bundle for storage. Defaults to False.
storeallparts = True storeallparts = True
# routes each incoming push to the bundlestore. defaults to False
pushtobundlestore = True
[remotenames] [remotenames]
# Client-side option # Client-side option
# This option should be set only if remotenames extension is enabled. # This option should be set only if remotenames extension is enabled.
# Whether remote bookmarks are tracked by remotenames extension. # Whether remote bookmarks are tracked by remotenames extension.
bookmarks = True bookmarks = True
""" """
from __future__ import absolute_import from __future__ import absolute_import
default='', default='',
) )
configitem('scratchbranch', 'storepath', configitem('scratchbranch', 'storepath',
default='', default='',
) )
configitem('infinitepush', 'branchpattern', configitem('infinitepush', 'branchpattern',
default='', default='',
) )
configitem('infinitepush', 'pushtobundlestore',
default=False,
)
configitem('experimental', 'server-bundlestore-bookmark', configitem('experimental', 'server-bundlestore-bookmark',
default='', default='',
) )
configitem('experimental', 'infinitepush-scratchpush', configitem('experimental', 'infinitepush-scratchpush',
default=False, default=False,
) )
experimental = 'experimental' experimental = 'experimental'
requestid=requestid, hostname=hostname, requestid=requestid, hostname=hostname,
reponame=ui.config('infinitepush', reponame=ui.config('infinitepush',
'reponame')) 'reponame'))
op.records.add('infinitepushlogger', logger) op.records.add('infinitepushlogger', logger)
else: else:
logger = logger[0] logger = logger[0]
return logger return logger
def storetobundlestore(orig, repo, op, unbundler):
"""stores the incoming bundle coming from push command to the bundlestore
instead of applying on the revlogs"""
repo.ui.status(_("storing changesets on the bundlestore\n"))
bundler = bundle2.bundle20(repo.ui)
# processing each part and storing it in bundler
with bundle2.partiterator(repo, op, unbundler) as parts:
for part in parts:
bundlepart = None
if part.type == 'replycaps':
# This configures the current operation to allow reply parts.
bundle2._processpart(op, part)
else:
bundlepart = bundle2.bundlepart(part.type, data=part.read())
for key, value in part.params.iteritems():
bundlepart.addparam(key, value)
# Certain parts require a response
if part.type in ('pushkey', 'changegroup'):
if op.reply is not None:
rpart = op.reply.newpart('reply:%s' % part.type)
rpart.addparam('in-reply-to', str(part.id),
mandatory=False)
rpart.addparam('return', '1', mandatory=False)
op.records.add(part.type, {
'return': 1,
})
if bundlepart:
bundler.addpart(bundlepart)
# storing the bundle in the bundlestore
buf = util.chunkbuffer(bundler.getchunks())
fd, bundlefile = tempfile.mkstemp()
try:
try:
fp = os.fdopen(fd, 'wb')
fp.write(buf.read())
finally:
fp.close()
storebundle(op, {}, bundlefile)
finally:
try:
os.unlink(bundlefile)
except Exception:
# we would rather see the original exception
pass
def processparts(orig, repo, op, unbundler): def processparts(orig, repo, op, unbundler):
# make sure we don't wrap processparts in case of `hg unbundle` # make sure we don't wrap processparts in case of `hg unbundle`
tr = repo.currenttransaction() tr = repo.currenttransaction()
if tr: if tr:
if tr.names[0].startswith('unbundle'): if tr.names[0].startswith('unbundle'):
return orig(repo, op, unbundler) return orig(repo, op, unbundler)
# this server routes each push to bundle store
if repo.ui.configbool('infinitepush', 'pushtobundlestore'):
return storetobundlestore(orig, repo, op, unbundler)
if unbundler.params.get('infinitepush') != 'True': if unbundler.params.get('infinitepush') != 'True':
return orig(repo, op, unbundler) return orig(repo, op, unbundler)
handleallparts = repo.ui.configbool('infinitepush', 'storeallparts') handleallparts = repo.ui.configbool('infinitepush', 'storeallparts')
bundler = bundle2.bundle20(repo.ui) bundler = bundle2.bundle20(repo.ui)
cgparams = None cgparams = None
with bundle2.partiterator(repo, op, unbundler) as parts: with bundle2.partiterator(repo, op, unbundler) as parts:

tests/test-infinitepush-ci.t

  • This file was added.
Testing the case when there is no infinitepush extension present on the client
side and the server routes each push to bundlestore. This case is very much
similar to CI use case.
Setup
-----
$ . "$TESTDIR/library-infinitepush.sh"
$ cat >> $HGRCPATH <<EOF
> [alias]
> glog = log -GT "{rev}:{node|short} {desc}\n{phase}"
> EOF
$ cp $HGRCPATH $TESTTMP/defaulthgrc
$ hg init repo
$ cd repo
$ setupserver
$ echo "pushtobundlestore = True" >> .hg/hgrc
$ echo "[extensions]" >> .hg/hgrc
$ echo "infinitepush=" >> .hg/hgrc
$ echo initialcommit > initialcommit
$ hg ci -Aqm "initialcommit"
$ hg phase --public .
$ cd ..
$ hg clone repo client -q
$ cd client
Pushing a new commit from the client to the server
-----------------------------------------------------
$ echo foobar > a
$ hg ci -Aqm "added a"
$ hg glog
@ 1:6cb0989601f1 added a
| draft
o 0:67145f466344 initialcommit
public
$ hg push
pushing to $TESTTMP/repo
searching for changes
storing changesets on the bundlestore
pushing 1 commit:
6cb0989601f1 added a
$ scratchnodes
6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
Understanding how data is stored on the bundlestore in server
-------------------------------------------------------------
There are two things, filebundlestore and index
$ ls ../repo/.hg/scratchbranches
filebundlestore
index
filebundlestore stores the bundles
$ ls ../repo/.hg/scratchbranches/filebundlestore/a4/c2/
a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
index/nodemap stores a map of node id and file in which bundle is stored in filebundlestore
$ ls ../repo/.hg/scratchbranches/index/
nodemap
$ ls ../repo/.hg/scratchbranches/index/nodemap/
6cb0989601f1fb5805238edfb16f3606713d9a0b
$ cd ../repo
Checking that the commit was not applied to revlog on the server
------------------------------------------------------------------
$ hg glog
@ 0:67145f466344 initialcommit
public
Applying the changeset from the bundlestore
--------------------------------------------
$ hg unbundle .hg/scratchbranches/filebundlestore/a4/c2/a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
mharbison72Unsubmitted
Not Done

On Windows, this command fails like so. Any thoughts on the unexpected end of stream?

--- c:/Users/Matt/projects/hg/tests/test-infinitepush-ci.t
+++ c:/Users/Matt/projects/hg/tests/test-infinitepush-ci.t.err
@@ -78,15 +78,12 @@

   $ hg unbundle .hg/scratchbranches/filebundlestore/a4/c2/a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
   adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
-  new changesets 6cb0989601f1
-  (run 'hg update' to get a working copy)
-
-  $ hg glog
-  o  1:6cb0989601f1 added a
-  |  public
+  transaction abort!
+  rollback completed
+  abort: stream ended unexpectedly  (got 68 bytes, expected 218759168)
+  [255]
+
+  $ hg glog
   @  0:67145f466344 initialcommit
      public
mharbison72: On Windows, this command fails like so. Any thoughts on the unexpected end of stream? ```…
pulkitAuthorUnsubmitted
Not Done

I looked at code but was unable to find any reason.
(Sorry for getting late to reply, I have phabricator emails turned off and I missed this one in mailing list.)

pulkit: I looked at code but was unable to find any reason. (Sorry for getting late to reply, I have…
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets 6cb0989601f1
(run 'hg update' to get a working copy)
$ hg glog
o 1:6cb0989601f1 added a
| public
@ 0:67145f466344 initialcommit
public
Pushing more changesets from the local repo
--------------------------------------------
$ cd ../client
$ echo b > b
$ hg ci -Aqm "added b"
$ echo c > c
$ hg ci -Aqm "added c"
$ hg glog
@ 3:bf8a6e3011b3 added c
| draft
o 2:eaba929e866c added b
| draft
o 1:6cb0989601f1 added a
| public
o 0:67145f466344 initialcommit
public
$ hg push
pushing to $TESTTMP/repo
searching for changes
storing changesets on the bundlestore
pushing 2 commits:
eaba929e866c added b
bf8a6e3011b3 added c
Checking that changesets are not applied on the server
------------------------------------------------------
$ hg glog -R ../repo
o 1:6cb0989601f1 added a
| public
@ 0:67145f466344 initialcommit
public
Both of the new changesets are stored in a single bundle-file
$ scratchnodes
6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
bf8a6e3011b345146bbbedbcb1ebd4837571492a ee41a41cefb7817cbfb235b4f6e9f27dbad6ca1f
eaba929e866c59bc9a6aada5a9dd2f6990db83c0 ee41a41cefb7817cbfb235b4f6e9f27dbad6ca1f
Pushing more changesets to the server
-------------------------------------
$ echo d > d
$ hg ci -Aqm "added d"
$ echo e > e
$ hg ci -Aqm "added e"
XXX: we should have pushed only the parts which are not in bundlestore
$ hg push
indygregUnsubmitted
Not Done

I actually think the behavior is acceptable. Having to dynamically overlay multiple bundles from the bundle store on the server feels like it will be a lot of work. For cases where the server is mainly ingesting ad-hoc commits, it is fine to have to re-push changesets.

This could get annoying if people are pushing very large changesets. But until we have a better store, I don't think there's much we can do.

indygreg: I actually think the behavior is acceptable. Having to dynamically overlay multiple bundles…
pushing to $TESTTMP/repo
searching for changes
storing changesets on the bundlestore
pushing 4 commits:
eaba929e866c added b
bf8a6e3011b3 added c
1bb96358eda2 added d
b4e4bce66051 added e
Sneak peek into the bundlestore at the server
$ scratchnodes
1bb96358eda285b536c6d1c66846a7cdb2336cea 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7
6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
b4e4bce660512ad3e71189e14588a70ac8e31fef 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7
bf8a6e3011b345146bbbedbcb1ebd4837571492a 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7
eaba929e866c59bc9a6aada5a9dd2f6990db83c0 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7
Checking if `hg pull` pulls something or `hg incoming` shows something
-----------------------------------------------------------------------
$ hg incoming
comparing with $TESTTMP/repo
searching for changes
no changes found
[1]
$ hg pull
pulling from $TESTTMP/repo
searching for changes
no changes found
Checking storage of phase information with the bundle on bundlestore
---------------------------------------------------------------------
creating a draft commit
$ cat >> $HGRCPATH <<EOF
> [phases]
> publish = False
> EOF
$ echo f > f
$ hg ci -Aqm "added f"
$ hg glog -r '.^::'
@ 6:9b42578d4447 added f
| draft
o 5:b4e4bce66051 added e
| public
~
$ hg push
pushing to $TESTTMP/repo
searching for changes
storing changesets on the bundlestore
pushing 5 commits:
eaba929e866c added b
bf8a6e3011b3 added c
1bb96358eda2 added d
b4e4bce66051 added e
9b42578d4447 added f
XXX: the phase of 9b42578d4447 should not be changed here
$ hg glog -r .
@ 6:9b42578d4447 added f
| public
~
applying the bundle on the server to check preservation of phase-information
$ cd ../repo
$ scratchnodes
1bb96358eda285b536c6d1c66846a7cdb2336cea 0a6e70ecd5b98d22382f69b93909f557ac6a9927
6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
9b42578d44473575994109161430d65dd147d16d 0a6e70ecd5b98d22382f69b93909f557ac6a9927
b4e4bce660512ad3e71189e14588a70ac8e31fef 0a6e70ecd5b98d22382f69b93909f557ac6a9927
bf8a6e3011b345146bbbedbcb1ebd4837571492a 0a6e70ecd5b98d22382f69b93909f557ac6a9927
eaba929e866c59bc9a6aada5a9dd2f6990db83c0 0a6e70ecd5b98d22382f69b93909f557ac6a9927
$ hg unbundle .hg/scratchbranches/filebundlestore/0a/6e/0a6e70ecd5b98d22382f69b93909f557ac6a9927
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files
new changesets eaba929e866c:9b42578d4447
(run 'hg update' to get a working copy)
$ hg glog
o 6:9b42578d4447 added f
| draft
o 5:b4e4bce66051 added e
| public
o 4:1bb96358eda2 added d
| public
o 3:bf8a6e3011b3 added c
| public
o 2:eaba929e866c added b
| public
o 1:6cb0989601f1 added a
| public
@ 0:67145f466344 initialcommit
public
Checking storage of obsmarkers in the bundlestore
--------------------------------------------------
enabling obsmarkers and rebase extension
$ cat >> $HGRCPATH << EOF
> [experimental]
> evolution = all
> [extensions]
> rebase =
> EOF
$ cd ../client
$ hg phase -r . --draft --force
$ hg rebase -r 6 -d 3
rebasing 6:9b42578d4447 "added f" (tip)
$ hg glog
@ 7:99949238d9ac added f
| draft
| o 5:b4e4bce66051 added e
| | public
| o 4:1bb96358eda2 added d
|/ public
o 3:bf8a6e3011b3 added c
| public
o 2:eaba929e866c added b
| public
o 1:6cb0989601f1 added a
| public
o 0:67145f466344 initialcommit
public
$ hg push -f
pushing to $TESTTMP/repo
searching for changes
storing changesets on the bundlestore
pushing 1 commit:
99949238d9ac added f
XXX: the phase should not have changed here
$ hg glog -r .
@ 7:99949238d9ac added f
| public
~
Unbundling on server to see obsmarkers being applied
$ cd ../repo
$ scratchnodes
1bb96358eda285b536c6d1c66846a7cdb2336cea 0a6e70ecd5b98d22382f69b93909f557ac6a9927
6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2
99949238d9ac7f2424a33a46dface6f866afd059 090a24fe63f31d3b4bee714447f835c8c362ff57
9b42578d44473575994109161430d65dd147d16d 0a6e70ecd5b98d22382f69b93909f557ac6a9927
b4e4bce660512ad3e71189e14588a70ac8e31fef 0a6e70ecd5b98d22382f69b93909f557ac6a9927
bf8a6e3011b345146bbbedbcb1ebd4837571492a 0a6e70ecd5b98d22382f69b93909f557ac6a9927
eaba929e866c59bc9a6aada5a9dd2f6990db83c0 0a6e70ecd5b98d22382f69b93909f557ac6a9927
$ hg glog
o 6:9b42578d4447 added f
| draft
o 5:b4e4bce66051 added e
| public
o 4:1bb96358eda2 added d
| public
o 3:bf8a6e3011b3 added c
| public
o 2:eaba929e866c added b
| public
o 1:6cb0989601f1 added a
| public
@ 0:67145f466344 initialcommit
public
$ hg unbundle .hg/scratchbranches/filebundlestore/09/0a/090a24fe63f31d3b4bee714447f835c8c362ff57
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
1 new obsolescence markers
obsoleted 1 changesets
new changesets 99949238d9ac
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg glog
o 7:99949238d9ac added f
| draft
| o 5:b4e4bce66051 added e
| | public
| o 4:1bb96358eda2 added d
|/ public
o 3:bf8a6e3011b3 added c
| public
o 2:eaba929e866c added b
| public
o 1:6cb0989601f1 added a
| public
@ 0:67145f466344 initialcommit
public