##// END OF EJS Templates
compression: introduce a `storage.revlog.zstd.level` configuration...
compression: introduce a `storage.revlog.zstd.level` configuration This option control the zstd compression level used when compressing revlog chunk. The usage of zstd for revlog compression has not graduated from experimental yet, but we intend to fix that soon. The option name for the compression level is more straight forward to pick, so this changesets comes first. Having a dedicated option for each compression engine is useful because they don't support the same range of values. I ran the same measurement as for the zlib compression level (in the parent changesets). The variation in repository size is stay mostly in the same (small) range. The "read/write" performance see smallish variation, but are overall much better than zlib. Write performance show the same tend of having better write performance for when reaching high-end compression. Again, we don't intend to change the default zstd compression level (currently: 3) in this series. However this is worth investigating in the future. The Performance comparison of zlib vs zstd is quite impressive. The repository size stay in the same range, but the performance are much better in all situations. Comparison summary ================== We are looking at: - performance range for zlib - performance range for zstd - comparison of default zstd (level-3) to default zlib (level 6) - comparison of the slowest zstd time to the fastest zlib time Read performance: ----------------- | zlib | zstd | cmp | f2s mercurial | 0.170159 - 0.189219 | 0.144127 - 0.149624 | 80% | 88% pypy | 2.679217 - 2.768691 | 1.532317 - 1.705044 | 60% | 63% netbeans | 122.477027 - 141.620281 | 72.996346 - 89.731560 | 58% | 73% mozilla | 147.867662 - 170.572118 | 91.700995 - 105.853099 | 56% | 71% Write performance: ------------------ | zlib | zstd | cmp | f2s mercurial | 53.250304 - 56.2936129 | 40.877025 - 45.677286 | 75% | 86% pypy | 460.721984 - 476.589918 | 270.545409 - 301.002219 | 63% | 65% netbeans | 520.560316 - 715.930400 | 370.356311 - 428.329652 | 55% | 82% mozilla | 739.803002 - 987.056093 | 505.152906 - 591.930683 | 57% | 80% Raw data -------- repo alg lvl .hg/store size 00manifest.d read write mercurial zlib 1 49,402,813 5,963,475 0.170159 53.250304 mercurial zlib 6 47,197,397 5,875,730 0.182820 56.264320 mercurial zlib 9 47,121,596 5,849,781 0.189219 56.293612 mercurial zstd 1 49,737,084 5,966,355 0.144127 40.877025 mercurial zstd 3 48,961,867 5,895,208 0.146376 42.268142 mercurial zstd 5 48,200,592 5,938,676 0.149624 43.162875 mercurial zstd 10 47,833,520 5,913,353 0.145185 44.012489 mercurial zstd 15 47,314,604 5,728,679 0.147686 45.677286 mercurial zstd 20 47,330,502 5,830,539 0.145789 45.025407 mercurial zstd 22 47,330,076 5,830,539 0.143996 44.690460 pypy zlib 1 370,830,572 28,462,425 2.679217 460.721984 pypy zlib 6 340,112,317 27,648,747 2.768691 467.537158 pypy zlib 9 338,360,736 27,639,003 2.763495 476.589918 pypy zstd 1 362,377,479 27,916,214 1.532317 270.545409 pypy zstd 3 354,137,693 27,905,988 1.686718 294.951509 pypy zstd 5 342,640,043 27,655,774 1.705044 301.002219 pypy zstd 10 334,224,327 27,164,493 1.567287 285.186239 pypy zstd 15 329,000,363 26,645,965 1.637729 299.561332 pypy zstd 20 324,534,039 26,199,547 1.526813 302.149827 pypy zstd 22 324,530,595 26,198,932 1.525718 307.821218 netbeans zlib 1 1,281,847,810 165,495,457 122.477027 520.560316 netbeans zlib 6 1,205,284,353 159,161,207 139.876147 715.930400 netbeans zlib 9 1,197,135,671 155,034,586 141.620281 678.297064 netbeans zstd 1 1,259,581,737 160,840,613 72.996346 370.356311 netbeans zstd 3 1,232,978,122 157,691,551 81.622317 396.733087 netbeans zstd 5 1,208,034,075 160,246,880 83.080549 364.342626 netbeans zstd 10 1,188,624,176 156,083,417 79.323935 403.594602 netbeans zstd 15 1,176,973,589 153,859,477 89.731560 428.329652 netbeans zstd 20 1,162,958,258 151,147,535 82.842667 392.335349 netbeans zstd 22 1,162,707,029 151,150,220 82.565695 402.840655 mozilla zlib 1 2,775,497,186 298,527,987 147.867662 751.263721 mozilla zlib 6 2,596,856,420 286,597,671 170.572118 987.056093 mozilla zlib 9 2,587,542,494 287,018,264 163.622338 739.803002 mozilla zstd 1 2,723,159,348 286,617,532 91.700995 570.042751 mozilla zstd 3 2,665,055,001 286,152,013 95.240155 561.412805 mozilla zstd 5 2,607,819,817 288,060,030 101.978048 505.152906 mozilla zstd 10 2,558,761,085 283,967,648 104.113481 497.771202 mozilla zstd 15 2,526,216,060 275,581,300 105.853099 591.930683 mozilla zstd 20 2,485,114,806 266,478,859 95.268795 576.515389 mozilla zstd 22 2,484,869,080 266,456,505 94.429282 572.785537

File last commit:

r41470:6d7f18cd default
r42211:bb271ec2 default
Show More
wireprotolfsserver.py
352 lines | 11.7 KiB | text/x-python | PythonLexer
/ hgext / lfs / wireprotolfsserver.py
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165 # wireprotolfsserver.py - lfs protocol server side implementation
#
# Copyright 2018 Matt Harbison <matt_harbison@yahoo.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
Matt Harbison
lfs: add server side support for the Batch API
r37166 import datetime
import errno
import json
Matt Harbison
lfs: log information about Internal Server Errors reported in the Batch API...
r37708 import traceback
Matt Harbison
lfs: add server side support for the Batch API
r37166
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165 from mercurial.hgweb import (
common as hgwebcommon,
)
from mercurial import (
Matt Harbison
lfs: convert to using exthelper to wrap functions...
r41078 exthelper,
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165 pycompat,
Matt Harbison
lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...
r38199 util,
Matt Harbison
lfs: convert to using exthelper to wrap functions...
r41078 wireprotoserver,
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165 )
Matt Harbison
lfs: gracefully handle aborts on the server when corrupt blobs are detected...
r37710 from . import blobstore
Matt Harbison
lfs: add server side support for the Batch API
r37166 HTTP_OK = hgwebcommon.HTTP_OK
Matt Harbison
lfs: add support for serving blob files
r37167 HTTP_CREATED = hgwebcommon.HTTP_CREATED
Matt Harbison
lfs: add server side support for the Batch API
r37166 HTTP_BAD_REQUEST = hgwebcommon.HTTP_BAD_REQUEST
Matt Harbison
lfs: ensure the transfer request is for a known URI...
r37267 HTTP_NOT_FOUND = hgwebcommon.HTTP_NOT_FOUND
Matt Harbison
lfs: update the HTTP status codes in error cases...
r37711 HTTP_METHOD_NOT_ALLOWED = hgwebcommon.HTTP_METHOD_NOT_ALLOWED
HTTP_NOT_ACCEPTABLE = hgwebcommon.HTTP_NOT_ACCEPTABLE
HTTP_UNSUPPORTED_MEDIA_TYPE = hgwebcommon.HTTP_UNSUPPORTED_MEDIA_TYPE
Matt Harbison
lfs: add server side support for the Batch API
r37166
Matt Harbison
lfs: convert to using exthelper to wrap functions...
r41078 eh = exthelper.exthelper()
@eh.wrapfunction(wireprotoserver, 'handlewsgirequest')
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165 def handlewsgirequest(orig, rctx, req, res, checkperm):
"""Wrap wireprotoserver.handlewsgirequest() to possibly process an LFS
request if it is left unprocessed by the wrapped method.
"""
if orig(rctx, req, res, checkperm):
return True
Matt Harbison
py3: add b'' prefixes to the LFS server module...
r41469 if not rctx.repo.ui.configbool(b'experimental', b'lfs.serve'):
Matt Harbison
lfs: add an experimental knob to disable blob serving...
r37265 return False
Matt Harbison
lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...
r38199 if not util.safehasattr(rctx.repo.svfs, 'lfslocalblobstore'):
return False
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165 if not req.dispatchpath:
return False
try:
if req.dispatchpath == b'.git/info/lfs/objects/batch':
Matt Harbison
py3: add b'' prefixes to the LFS server module...
r41469 checkperm(rctx, req, b'pull')
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165 return _processbatchrequest(rctx.repo, req, res)
# TODO: reserve and use a path in the proposed http wireprotocol /api/
# namespace?
elif req.dispatchpath.startswith(b'.hg/lfs/objects'):
return _processbasictransfer(rctx.repo, req, res,
lambda perm:
checkperm(rctx, req, perm))
return False
except hgwebcommon.ErrorResponse as e:
# XXX: copied from the handler surrounding wireprotoserver._callhttp()
# in the wrapped function. Should this be moved back to hgweb to
# be a common handler?
for k, v in e.headers:
res.headers[k] = v
res.status = hgwebcommon.statusmessage(e.code, pycompat.bytestr(e))
res.setbodybytes(b'0\n%s\n' % pycompat.bytestr(e))
return True
Matt Harbison
lfs: add server side support for the Batch API
r37166 def _sethttperror(res, code, message=None):
res.status = hgwebcommon.statusmessage(code, message=message)
res.headers[b'Content-Type'] = b'text/plain; charset=utf-8'
res.setbodybytes(b'')
Matt Harbison
lfs: log information about Internal Server Errors reported in the Batch API...
r37708 def _logexception(req):
"""Write information about the current exception to wsgi.errors."""
tb = pycompat.sysbytes(traceback.format_exc())
Matt Harbison
py3: add b'' prefixes to the LFS server module...
r41469 errorlog = req.rawenv[b'wsgi.errors']
Matt Harbison
lfs: log information about Internal Server Errors reported in the Batch API...
r37708
uri = b''
if req.apppath:
uri += req.apppath
uri += b'/' + req.dispatchpath
errorlog.write(b"Exception happened while processing request '%s':\n%s" %
(uri, tb))
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165 def _processbatchrequest(repo, req, res):
"""Handle a request for the Batch API, which is the gateway to granting file
access.
https://github.com/git-lfs/git-lfs/blob/master/docs/api/batch.md
"""
Matt Harbison
lfs: add server side support for the Batch API
r37166
# Mercurial client request:
#
# HOST: localhost:$HGPORT
# ACCEPT: application/vnd.git-lfs+json
# ACCEPT-ENCODING: identity
# USER-AGENT: git-lfs/2.3.4 (Mercurial 4.5.2+1114-f48b9754f04c+20180316)
# Content-Length: 125
# Content-Type: application/vnd.git-lfs+json
#
# {
# "objects": [
# {
# "oid": "31cf...8e5b"
# "size": 12
# }
# ]
# "operation": "upload"
# }
Matt Harbison
lfs: update the HTTP status codes in error cases...
r37711 if req.method != b'POST':
_sethttperror(res, HTTP_METHOD_NOT_ALLOWED)
return True
if req.headers[b'Content-Type'] != b'application/vnd.git-lfs+json':
_sethttperror(res, HTTP_UNSUPPORTED_MEDIA_TYPE)
return True
if req.headers[b'Accept'] != b'application/vnd.git-lfs+json':
_sethttperror(res, HTTP_NOT_ACCEPTABLE)
Matt Harbison
lfs: add server side support for the Batch API
r37166 return True
# XXX: specify an encoding?
lfsreq = json.loads(req.bodyfh.read())
# If no transfer handlers are explicitly requested, 'basic' is assumed.
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 if r'basic' not in lfsreq.get(r'transfers', [r'basic']):
Matt Harbison
lfs: add server side support for the Batch API
r37166 _sethttperror(res, HTTP_BAD_REQUEST,
b'Only the basic LFS transfer handler is supported')
return True
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 operation = lfsreq.get(r'operation')
operation = pycompat.bytestr(operation)
if operation not in (b'upload', b'download'):
Matt Harbison
lfs: add server side support for the Batch API
r37166 _sethttperror(res, HTTP_BAD_REQUEST,
b'Unsupported LFS transfer operation: %s' % operation)
return True
localstore = repo.svfs.lfslocalblobstore
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 objects = [p for p in _batchresponseobjects(req, lfsreq.get(r'objects', []),
Matt Harbison
lfs: add server side support for the Batch API
r37166 operation, localstore)]
rsp = {
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 r'transfer': r'basic',
r'objects': objects,
Matt Harbison
lfs: add server side support for the Batch API
r37166 }
res.status = hgwebcommon.statusmessage(HTTP_OK)
res.headers[b'Content-Type'] = b'application/vnd.git-lfs+json'
res.setbodybytes(pycompat.bytestr(json.dumps(rsp)))
return True
def _batchresponseobjects(req, objects, action, store):
"""Yield one dictionary of attributes for the Batch API response for each
object in the list.
req: The parsedrequest for the Batch API request
objects: The list of objects in the Batch API object request list
action: 'upload' or 'download'
store: The local blob store for servicing requests"""
# Successful lfs-test-server response to solict an upload:
# {
# u'objects': [{
# u'size': 12,
# u'oid': u'31cf...8e5b',
# u'actions': {
# u'upload': {
# u'href': u'http://localhost:$HGPORT/objects/31cf...8e5b',
# u'expires_at': u'0001-01-01T00:00:00Z',
# u'header': {
# u'Accept': u'application/vnd.git-lfs'
# }
# }
# }
# }]
# }
# TODO: Sort out the expires_at/expires_in/authenticated keys.
for obj in objects:
# Convert unicode to ASCII to create a filesystem path
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 soid = obj.get(r'oid')
oid = soid.encode(r'ascii')
Matt Harbison
lfs: add server side support for the Batch API
r37166 rsp = {
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 r'oid': soid,
r'size': obj.get(r'size'), # XXX: should this check the local size?
#r'authenticated': True,
Matt Harbison
lfs: add server side support for the Batch API
r37166 }
exists = True
verifies = False
# Verify an existing file on the upload request, so that the client is
# solicited to re-upload if it corrupt locally. Download requests are
# also verified, so the error can be flagged in the Batch API response.
# (Maybe we can use this to short circuit the download for `hg verify`,
# IFF the client can assert that the remote end is an hg server.)
# Otherwise, it's potentially overkill on download, since it is also
# verified as the file is streamed to the caller.
try:
verifies = store.verify(oid)
Matt Harbison
py3: add b'' prefixes to the LFS server module...
r41469 if verifies and action == b'upload':
Matt Harbison
lfs: ensure the blob is linked to the remote store on skipped uploads...
r39491 # The client will skip this upload, but make sure it remains
# available locally.
store.linkfromusercache(oid)
Matt Harbison
lfs: add server side support for the Batch API
r37166 except IOError as inst:
if inst.errno != errno.ENOENT:
Matt Harbison
lfs: log information about Internal Server Errors reported in the Batch API...
r37708 _logexception(req)
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 rsp[r'error'] = {
r'code': 500,
r'message': inst.strerror or r'Internal Server Server'
Matt Harbison
lfs: add server side support for the Batch API
r37166 }
yield rsp
continue
exists = False
# Items are always listed for downloads. They are dropped for uploads
# IFF they already exist locally.
Matt Harbison
py3: add b'' prefixes to the LFS server module...
r41469 if action == b'download':
Matt Harbison
lfs: add server side support for the Batch API
r37166 if not exists:
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 rsp[r'error'] = {
r'code': 404,
r'message': r"The object does not exist"
Matt Harbison
lfs: add server side support for the Batch API
r37166 }
yield rsp
continue
elif not verifies:
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 rsp[r'error'] = {
r'code': 422, # XXX: is this the right code?
r'message': r"The object is corrupt"
Matt Harbison
lfs: add server side support for the Batch API
r37166 }
yield rsp
continue
elif verifies:
yield rsp # Skip 'actions': already uploaded
continue
expiresat = datetime.datetime.now() + datetime.timedelta(minutes=10)
Matt Harbison
lfs: add the 'Authorization' property to the Batch API response, if present...
r37784 def _buildheader():
# The spec doesn't mention the Accept header here, but avoid
# a gratuitous deviation from lfs-test-server in the test
# output.
hdr = {
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 r'Accept': r'application/vnd.git-lfs'
Matt Harbison
lfs: add the 'Authorization' property to the Batch API response, if present...
r37784 }
Matt Harbison
py3: add b'' prefixes to the LFS server module...
r41469 auth = req.headers.get(b'Authorization', b'')
if auth.startswith(b'Basic '):
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 hdr[r'Authorization'] = pycompat.strurl(auth)
Matt Harbison
lfs: add the 'Authorization' property to the Batch API response, if present...
r37784
return hdr
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 rsp[r'actions'] = {
r'%s' % pycompat.strurl(action): {
r'href': pycompat.strurl(b'%s%s/.hg/lfs/objects/%s'
% (req.baseurl, req.apppath, oid)),
Matt Harbison
lfs: add server side support for the Batch API
r37166 # datetime.isoformat() doesn't include the 'Z' suffix
Matt Harbison
py3: raw stringify various things in the LFS server module...
r41470 r"expires_at": expiresat.strftime(r'%Y-%m-%dT%H:%M:%SZ'),
r'header': _buildheader(),
Matt Harbison
lfs: add server side support for the Batch API
r37166 }
}
yield rsp
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165
def _processbasictransfer(repo, req, res, checkperm):
"""Handle a single file upload (PUT) or download (GET) action for the Basic
Transfer Adapter.
After determining if the request is for an upload or download, the access
must be checked by calling ``checkperm()`` with either 'pull' or 'upload'
before accessing the files.
https://github.com/git-lfs/git-lfs/blob/master/docs/api/basic-transfers.md
"""
method = req.method
Matt Harbison
lfs: avoid an improper usage of os.path.basename() to parse a URI
r37266 oid = req.dispatchparts[-1]
Matt Harbison
lfs: add support for serving blob files
r37167 localstore = repo.svfs.lfslocalblobstore
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165
Matt Harbison
lfs: ensure the transfer request is for a known URI...
r37267 if len(req.dispatchparts) != 4:
_sethttperror(res, HTTP_NOT_FOUND)
return True
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165 if method == b'PUT':
Matt Harbison
py3: add b'' prefixes to the LFS server module...
r41469 checkperm(b'upload')
Matt Harbison
lfs: add support for serving blob files
r37167
# TODO: verify Content-Type?
existed = localstore.has(oid)
# TODO: how to handle timeouts? The body proxy handles limiting to
# Content-Length, but what happens if a client sends less than it
# says it will?
Matt Harbison
lfs: gracefully handle aborts on the server when corrupt blobs are detected...
r37710 statusmessage = hgwebcommon.statusmessage
try:
localstore.download(oid, req.bodyfh)
res.status = statusmessage(HTTP_OK if existed else HTTP_CREATED)
except blobstore.LfsCorruptionError:
_logexception(req)
Matt Harbison
lfs: add support for serving blob files
r37167
Matt Harbison
lfs: gracefully handle aborts on the server when corrupt blobs are detected...
r37710 # XXX: Is this the right code?
res.status = statusmessage(422, b'corrupt blob')
Matt Harbison
lfs: add support for serving blob files
r37167
# There's no payload here, but this is the header that lfs-test-server
# sends back. This eliminates some gratuitous test output conditionals.
res.headers[b'Content-Type'] = b'text/plain; charset=utf-8'
res.setbodybytes(b'')
return True
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165 elif method == b'GET':
Matt Harbison
py3: add b'' prefixes to the LFS server module...
r41469 checkperm(b'pull')
Matt Harbison
lfs: add basic routing for the server side wire protocol processing...
r37165
Matt Harbison
lfs: add support for serving blob files
r37167 res.status = hgwebcommon.statusmessage(HTTP_OK)
res.headers[b'Content-Type'] = b'application/octet-stream'
Matt Harbison
lfs: gracefully handle aborts on the server when corrupt blobs are detected...
r37710 try:
# TODO: figure out how to send back the file in chunks, instead of
# reading the whole thing. (Also figure out how to send back
# an error status if an IOError occurs after a partial write
# in that case. Here, everything is read before starting.)
res.setbodybytes(localstore.read(oid))
except blobstore.LfsCorruptionError:
_logexception(req)
# XXX: Is this the right code?
res.status = hgwebcommon.statusmessage(422, b'corrupt blob')
res.setbodybytes(b'')
Matt Harbison
lfs: add support for serving blob files
r37167
return True
else:
Matt Harbison
lfs: update the HTTP status codes in error cases...
r37711 _sethttperror(res, HTTP_METHOD_NOT_ALLOWED,
Matt Harbison
lfs: add support for serving blob files
r37167 message=b'Unsupported LFS transfer method: %s' % method)
return True