D2958: infinitepush: introduce server option to route every push to bundlestore
pulkit added inline comments. INLINE COMMENTS > mharbison72 wrote in 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 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.) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2958 To: pulkit, #hg-reviewers, indygreg Cc: mharbison72, indygreg, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2958: infinitepush: introduce server option to route every push to bundlestore
mharbison72 added inline comments. INLINE COMMENTS > test-infinitepush-ci.t:79 > + > + $ hg unbundle > .hg/scratchbranches/filebundlestore/a4/c2/a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 > + adding changesets 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 REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2958 To: pulkit, #hg-reviewers, indygreg Cc: mharbison72, indygreg, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2958: infinitepush: introduce server option to route every push to bundlestore
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG571f25dae740: infinitepush: introduce server option to
route every push to bundlestore (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2958?vs=7341=7430
REVISION DETAIL
https://phab.mercurial-scm.org/D2958
AFFECTED FILES
hgext/infinitepush/__init__.py
tests/test-infinitepush-ci.t
CHANGE DETAILS
diff --git a/tests/test-infinitepush-ci.t b/tests/test-infinitepush-ci.t
new file mode 100644
--- /dev/null
+++ b/tests/test-infinitepush-ci.t
@@ -0,0 +1,344 @@
+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 < [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
+ 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
+ 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
+
D2958: infinitepush: introduce server option to route every push to bundlestore
indygreg accepted this revision. indygreg added a comment. This revision is now accepted and ready to land. This looks reasonable. Could we also please get an explicit test for `hg pull -r ` 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. INLINE COMMENTS > test-infinitepush-ci.t:142 > + > +XXX: we should have pushed only the parts which are not in bundlestore > + $ hg push 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2958 To: pulkit, #hg-reviewers, indygreg Cc: indygreg, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2958: infinitepush: introduce server option to route every push to bundlestore
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION 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.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2958
AFFECTED FILES
hgext/infinitepush/__init__.py
tests/test-infinitepush-ci.t
CHANGE DETAILS
diff --git a/tests/test-infinitepush-ci.t b/tests/test-infinitepush-ci.t
new file mode 100644
--- /dev/null
+++ b/tests/test-infinitepush-ci.t
@@ -0,0 +1,344 @@
+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 < [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
+ 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
+
