This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7963

lfs: enable workers by default
ClosedPublic

Authored by mharbison72 on Jan 21 2020, 1:38 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG87167caa2989: lfs: enable workers by default
Summary

With the stall issue seemingly fixed, there's no reason not to use workers. The
setting is left for now to keep the test output deterministic, and in case other
issues come up. If none do, this can be converted to a developer setting for
usage with the tests.

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

mharbison72 created this revision.Jan 21 2020, 1:38 PM
marmoute accepted this revision.Feb 5 2020, 6:20 PM
marmoute added a subscriber: marmoute.

Seem good to go, once the other one in the series are taken.

mharbison72 added a commit: rHG87167caa2989: lfs: enable workers by default.Feb 6 2020, 5:20 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG87167caa2989: lfs: enable workers by default (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 19974

hgext/lfs/TODO.rst

#. Remove `lfs.retry` hack in client? This came from FB, but it's not clear why #. Remove `lfs.retry` hack in client? This came from FB, but it's not clear why
it is/was needed. it is/was needed.
#. `hg export` currently writes out the LFS blob. Should it write the pointer #. `hg export` currently writes out the LFS blob. Should it write the pointer
instead? instead?
* `hg diff` is similar, and probably shouldn't see the pointer file * `hg diff` is similar, and probably shouldn't see the pointer file
#. `Fix https multiplexing, and re-enable workers
<https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-January/109916.html>`_.
#. Show to-be-applied rules with `hg files -r 'wdir()' 'set:lfs()'` #. Show to-be-applied rules with `hg files -r 'wdir()' 'set:lfs()'`
* `debugignore` can show file + line number, so a dedicated command could be * `debugignore` can show file + line number, so a dedicated command could be
useful too. useful too.
#. Filesets, revsets and templates #. Filesets, revsets and templates
* A dedicated revset should be faster than `'file(set:lfs())'` * A dedicated revset should be faster than `'file(set:lfs())'`

hgext/lfs/__init__.py

) )
eh.configitem( eh.configitem(
b'experimental', b'lfs.user-agent', default=None, b'experimental', b'lfs.user-agent', default=None,
) )
eh.configitem( eh.configitem(
b'experimental', b'lfs.disableusercache', default=False, b'experimental', b'lfs.disableusercache', default=False,
) )
eh.configitem( eh.configitem(
b'experimental', b'lfs.worker-enable', default=False, b'experimental', b'lfs.worker-enable', default=True,
) )
eh.configitem( eh.configitem(
b'lfs', b'url', default=None, b'lfs', b'url', default=None,
) )
eh.configitem( eh.configitem(
b'lfs', b'usercache', default=None, b'lfs', b'usercache', default=None,
) )

tests/test-lfs-serve-access.t

Serving LFS files can experimentally be turned off. The long term solution is Serving LFS files can experimentally be turned off. The long term solution is
to support the 'verify' action in both client and server, so that the server can to support the 'verify' action in both client and server, so that the server can
tell the client to store files elsewhere. tell the client to store files elsewhere.
$ hg init server $ hg init server
$ hg --config "lfs.usercache=$TESTTMP/servercache" \ $ hg --config "lfs.usercache=$TESTTMP/servercache" \
> --config experimental.lfs.serve=False -R server serve -d \ > --config experimental.lfs.serve=False -R server serve -d \
> --config experimental.lfs.worker-enable=False \
> -p $HGPORT --pid-file=hg.pid -A $TESTTMP/access.log -E $TESTTMP/errors.log > -p $HGPORT --pid-file=hg.pid -A $TESTTMP/access.log -E $TESTTMP/errors.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
Uploads fail... Uploads fail...
$ hg init client $ hg init client
$ echo 'this-is-an-lfs-file' > client/lfs.bin $ echo 'this-is-an-lfs-file' > client/lfs.bin
$ hg -R client ci -Am 'initial commit' $ hg -R client ci -Am 'initial commit'

tests/test-lfs-serve.t

only loaded on one side. If that *is* enabled, the subsequent failure is "abort: only loaded on one side. If that *is* enabled, the subsequent failure is "abort:
missing processor for flag '0x2000'!" if the extension is only loaded on one side missing processor for flag '0x2000'!" if the extension is only loaded on one side
(possibly also masked by the Internal Server Error message). (possibly also masked by the Internal Server Error message).
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> debugprocessors = $TESTTMP/debugprocessors.py > debugprocessors = $TESTTMP/debugprocessors.py
> [experimental] > [experimental]
> lfs.disableusercache = True > lfs.disableusercache = True
> lfs.worker-enable = False
> [lfs] > [lfs]
> threshold=10 > threshold=10
> [web] > [web]
> allow_push=* > allow_push=*
> push_ssl=False > push_ssl=False
> EOF > EOF
$ cp $HGRCPATH $HGRCPATH.orig $ cp $HGRCPATH $HGRCPATH.orig

tests/test-lfs-test-server.t

> sys.stdout.write('%s\n' % p.pid) > sys.stdout.write('%s\n' % p.pid)
> sys.exit(0) > sys.exit(0)
> sys.exit(1) > sys.exit(1)
> EOF > EOF
$ "$PYTHON" $TESTTMP/spawn.py >> $DAEMON_PIDS $ "$PYTHON" $TESTTMP/spawn.py >> $DAEMON_PIDS
#endif #endif
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [experimental]
> lfs.worker-enable = False
> [extensions] > [extensions]
> lfs= > lfs=
> [lfs] > [lfs]
> url=http://foo:bar@$LFS_HOST > url=http://foo:bar@$LFS_HOST
> track=all() > track=all()
> [web] > [web]
> push_ssl = False > push_ssl = False
> allow-push = * > allow-push = *